diff --git a/.gitignore b/.gitignore
index 822d07fb2..a388a5ae8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,4 @@
 /tools/*/*.exe
 /tools/lemon/build
 /tools/re2c/build
-/wadsrc/*.pk3
+/wadsrc*/*.pk3
diff --git a/gzdoom.sln b/gzdoom.sln
index 16d1acc3d..c87c648e9 100644
--- a/gzdoom.sln
+++ b/gzdoom.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gzdoom", "gzdoom.vcproj", "{8049475B-5C87-46F9-9358-635218A4EF18}"
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zdoom", "gzdoom.vcproj", "{8049475B-5C87-46F9-9358-635218A4EF18}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9B465A9E-E5C7-4577-B559-3CA2F7AE7D96} = {9B465A9E-E5C7-4577-B559-3CA2F7AE7D96}
 		{F9D9E7D4-E1A2-4866-9E85-B1B14137EE63} = {F9D9E7D4-E1A2-4866-9E85-B1B14137EE63}
@@ -27,6 +27,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wadsrc", "wadsrc\wadsrc.vcp
 		{24A19C02-F041-4AB0-A1A1-02E1E88EDBD3} = {24A19C02-F041-4AB0-A1A1-02E1E88EDBD3}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wadsrc-brightmaps", "wadsrc_bm\brightmaps.vcproj", "{087B206F-F49E-4EFB-92CB-E1F6E32D1278}"
+	ProjectSection(ProjectDependencies) = postProject
+		{24A19C02-F041-4AB0-A1A1-02E1E88EDBD3} = {24A19C02-F041-4AB0-A1A1-02E1E88EDBD3}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wadsrc-lights", "wadsrc_lights\lights.vcproj", "{31090871-A623-4BBC-A167-DE821CD1240C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{24A19C02-F041-4AB0-A1A1-02E1E88EDBD3} = {24A19C02-F041-4AB0-A1A1-02E1E88EDBD3}
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "updaterevision", "tools\updaterevision\updaterevision.vcproj", "{6077B7D6-349F-4077-B552-3BC302EF5859}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg-6b", "jpeg-6b\jpeg-6b.vcproj", "{AC3F5340-40CB-4C3A-8AA7-CB7158DB4466}"
@@ -98,6 +108,18 @@ Global
 		{1D179D4B-F008-431B-8C72-111F8372584F}.Release|Win32.Build.0 = Release|Win32
 		{1D179D4B-F008-431B-8C72-111F8372584F}.Release|x64.ActiveCfg = Release|Win32
 		{1D179D4B-F008-431B-8C72-111F8372584F}.Release|x64.Build.0 = Release|Win32
+		{087B206F-F49E-4EFB-92CB-E1F6E32D1278}.Debug|Win32.ActiveCfg = Debug|Win32
+		{087B206F-F49E-4EFB-92CB-E1F6E32D1278}.Debug|Win32.Build.0 = Debug|Win32
+		{087B206F-F49E-4EFB-92CB-E1F6E32D1278}.Debug|x64.ActiveCfg = Debug|Win32
+		{087B206F-F49E-4EFB-92CB-E1F6E32D1278}.Release|Win32.ActiveCfg = Release|Win32
+		{087B206F-F49E-4EFB-92CB-E1F6E32D1278}.Release|Win32.Build.0 = Release|Win32
+		{087B206F-F49E-4EFB-92CB-E1F6E32D1278}.Release|x64.ActiveCfg = Release|Win32
+		{31090871-A623-4BBC-A167-DE821CD1240C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{31090871-A623-4BBC-A167-DE821CD1240C}.Debug|Win32.Build.0 = Debug|Win32
+		{31090871-A623-4BBC-A167-DE821CD1240C}.Debug|x64.ActiveCfg = Debug|Win32
+		{31090871-A623-4BBC-A167-DE821CD1240C}.Release|Win32.ActiveCfg = Release|Win32
+		{31090871-A623-4BBC-A167-DE821CD1240C}.Release|Win32.Build.0 = Release|Win32
+		{31090871-A623-4BBC-A167-DE821CD1240C}.Release|x64.ActiveCfg = Release|Win32
 		{6077B7D6-349F-4077-B552-3BC302EF5859}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6077B7D6-349F-4077-B552-3BC302EF5859}.Debug|Win32.Build.0 = Debug|Win32
 		{6077B7D6-349F-4077-B552-3BC302EF5859}.Debug|x64.ActiveCfg = Debug|x64