diff --git a/tools/builder/LinuxBuilder.cs b/tools/builder/LinuxBuilder.cs
index ea32d8da..689b9d87 100644
--- a/tools/builder/LinuxBuilder.cs
+++ b/tools/builder/LinuxBuilder.cs
@@ -45,6 +45,10 @@ namespace builder
 			{
 				output_folder += ".orangebox";
 			}
+			else if (lib.build_mode == BuildMode.BuildMode_Episode2Valve)
+			{
+				output_folder += ".orangeboxvalve";
+			}
 			else if (lib.build_mode == BuildMode.BuildMode_OldMetamod)
 			{
 				output_folder += ".original";
@@ -73,6 +77,10 @@ namespace builder
 			{
 				makefile_args += "ENGINE=\"orangebox\" ";
 			}
+			else if (lib.build_mode == BuildMode.BuildMode_Episode2Valve)
+			{
+				makefile_args += "ENGINE=\"orangeboxvalve\" ";
+			}
 			else if (lib.build_mode == BuildMode.BuildMode_OldMetamod)
 			{
 				makefile_args += "ENGINE=\"original\"";
diff --git a/tools/builder/Package.cs b/tools/builder/Package.cs
index 852a3bf5..8e79e596 100644
--- a/tools/builder/Package.cs
+++ b/tools/builder/Package.cs
@@ -15,6 +15,7 @@ namespace builder
 		BuildMode_DarkMessiah,
 		BuildMode_Episode1,
 		BuildMode_Episode2,
+		BuildMode_Episode2Valve,
 		BuildMode_Left4Dead
 	};
 
diff --git a/tools/builder/PkgCore.cs b/tools/builder/PkgCore.cs
index bafd5770..71de7595 100644
--- a/tools/builder/PkgCore.cs
+++ b/tools/builder/PkgCore.cs
@@ -177,6 +177,14 @@ namespace builder
 			lib.build_mode = BuildMode.BuildMode_Episode2;
 			libraries.Add(lib);
 
+			lib = new Library();
+			lib.package_path = "addons/sourcemod/bin";
+			lib.source_path = "core";
+			lib.binary_name = "sourcemod.2.ep2valve";
+			lib.vcproj_name = "sourcemod_mm";
+			lib.build_mode = BuildMode.BuildMode_Episode2Valve;
+			libraries.Add(lib);
+
 			lib = new Library();
 			lib.package_path = "addons/sourcemod/bin";
 			lib.source_path = "core";
@@ -231,6 +239,14 @@ namespace builder
 			lib.build_mode = BuildMode.BuildMode_Episode2;
 			libraries.Add(lib);
 
+			lib = new Library();
+			lib.package_path = "addons/sourcemod/extensions/auto.2.ep2valve";
+			lib.source_path = "extensions/bintools";
+			lib.binary_name = "bintools.ext";
+			lib.vcproj_name = "bintools";
+			lib.build_mode = BuildMode.BuildMode_Episode2Valve;
+			libraries.Add(lib);
+
 			lib = new Library();
 			lib.package_path = "addons/sourcemod/extensions/auto.2.l4d";
 			lib.source_path = "extensions/bintools";
@@ -271,6 +287,14 @@ namespace builder
 			lib.build_mode = BuildMode.BuildMode_Episode2;
 			libraries.Add(lib);
 
+			lib = new Library();
+			lib.package_path = "addons/sourcemod/extensions/auto.2.ep2valve";
+			lib.source_path = "extensions/sdktools";
+			lib.binary_name = "sdktools.ext";
+			lib.vcproj_name = "sdktools";
+			lib.build_mode = BuildMode.BuildMode_Episode2Valve;
+			libraries.Add(lib);
+
 			lib = new Library();
 			lib.package_path = "addons/sourcemod/extensions/auto.2.l4d";
 			lib.source_path = "extensions/sdktools";
@@ -302,11 +326,11 @@ namespace builder
 			libraries.Add(lib);
 
 			lib = new Library();
-			lib.package_path = "addons/sourcemod/extensions/auto.2.ep2";
+			lib.package_path = "addons/sourcemod/extensions/auto.2.ep2valve";
 			lib.source_path = "extensions/tf2";
 			lib.binary_name = "game.tf2.ext";
 			lib.vcproj_name = "tf2";
-			lib.build_mode = BuildMode.BuildMode_Episode2;
+			lib.build_mode = BuildMode.BuildMode_Episode2Valve;
 			libraries.Add(lib);
 
 			lib = new Library();
diff --git a/tools/builder/Win32Builder.cs b/tools/builder/Win32Builder.cs
index fc83fb44..3f6e20c1 100644
--- a/tools/builder/Win32Builder.cs
+++ b/tools/builder/Win32Builder.cs
@@ -50,6 +50,10 @@ namespace builder
 			{
 				config_name = config_name + " - Orange Box";
 			}
+			else if (lib.build_mode == BuildMode.BuildMode_Episde2Valve)
+			{
+				config_name = config_name + " - Orange Box Valve";
+			}
 			else if (lib.build_mode == BuildMode.BuildMode_OldMetamod)
 			{
 				config_name = config_name + " - Old Metamod";