diff --git a/gamedata/core.games/common.games.txt b/gamedata/core.games/common.games.txt
index 62cee74a..e6dbc128 100644
--- a/gamedata/core.games/common.games.txt
+++ b/gamedata/core.games/common.games.txt
@@ -139,6 +139,7 @@
 			"game"					"FortressForever"
 			"game"					"zps"
 			"game"					"gesource"
+			"game"					"cstrike_beta"
 		}
 
 		"Keys"
@@ -164,6 +165,8 @@
 			"game"					"zps"
 			"game"					"gesource"
 			"game"					"obsidian"
+			"game"					"cstrike"
+			"game"					"cstrike_beta"
 		}
 		
 		"Keys"
@@ -199,12 +202,31 @@
 		}
 	}
 
-	"cstrike"
+	"#default"
 	{
+		"#supported"
+		{
+			"game"		"cstrike"
+			"game"		"cstrike_beta"
+		}
+		
+		"Keys"
+		{
+			"GameExtension"		"game.cstrike"
+		}
+	}
+		
+	"#default"
+	{
+		"#supported"
+		{
+			"game"		"cstrike"
+			"engine"	"original"
+		}
+		
 		"Keys"
 		{
 			"HintTextPreByte"		"yes"
-			"GameExtension"			"game.cstrike"
 		}
 	}
 
diff --git a/gamedata/core.games/engine.ep2valve.txt b/gamedata/core.games/engine.ep2valve.txt
index f83d2acf..ac377394 100644
--- a/gamedata/core.games/engine.ep2valve.txt
+++ b/gamedata/core.games/engine.ep2valve.txt
@@ -18,6 +18,8 @@
 		{
 			"game"		"dod"
 			"game"		"tf"
+			"game"		"cstrike"
+			"game"		"cstrike_beta"
 		}
 		
 		"Offsets"
diff --git a/gamedata/sdktools.games/engine.ep2valve.txt b/gamedata/sdktools.games/engine.ep2valve.txt
index 428cbf30..b7bb9a42 100644
--- a/gamedata/sdktools.games/engine.ep2valve.txt
+++ b/gamedata/sdktools.games/engine.ep2valve.txt
@@ -18,6 +18,8 @@
 		{
 			"game"		"dod"
 			"game"		"tf"
+			"game"		"cstrike"
+			"game"		"cstrike_beta"
 		}
 
 		"Offsets"
@@ -66,6 +68,8 @@
 		{
 			"game"		"dod"
 			"game"		"tf"
+			"game"		"cstrike"
+			"game"		"cstrike_beta"
 		}
 
 		"Signatures"
@@ -92,6 +96,8 @@
 		{
 			"game"		"dod"
 			"game"		"tf"
+			"game"		"cstrike"
+			"game"		"cstrike_beta"
 		}
 		
 		"Signatures"
@@ -113,6 +119,8 @@
 		{
 			"game"		"dod"
 			"game"		"tf"
+			"game"		"cstrike"
+			"game"		"cstrike_beta"
 		}
 		
 		"Offsets"
@@ -204,6 +212,8 @@
 		{
 			"game"		"dod"
 			"game"		"tf"
+			"game"		"cstrike"
+			"game"		"cstrike_beta"
 		}
 		"Signatures"
 		{
diff --git a/gamedata/sdktools.games/game.cstrike.txt b/gamedata/sdktools.games/game.cstrike.txt
index bd6df222..64e4641b 100644
--- a/gamedata/sdktools.games/game.cstrike.txt
+++ b/gamedata/sdktools.games/game.cstrike.txt
@@ -12,8 +12,14 @@
 "Games"
 {
 	/* Counter-Strike: Source */
-	"cstrike"
+	"#default"
 	{
+		"#supported"
+		{
+			"engine"	"original"
+			"game"		"cstrike"
+		}
+	
 		"Keys"
 		{
 			"SlapSoundCount"	"3"
@@ -111,4 +117,112 @@
 			}
 		}
 	}
+		
+	/* Counter-Strike: Source ORANGEBOX */
+	"#default"
+	{
+		"#supported"
+		{
+			"engine"	"orangebox_valve"
+			"game"		"cstrike"
+			"game"		"cstrike_beta"
+		}
+	
+		"Keys"
+		{
+			"SlapSoundCount"	"3"
+			"SlapSound1"		"player/damage1.wav"
+			"SlapSound2"		"player/damage2.wav"
+			"SlapSound3"		"player/damage3.wav"
+		}
+
+		"Offsets"
+		{
+			"GiveNamedItem"
+			{
+				"windows"	"386"
+				"linux"		"387"
+			}
+			"RemovePlayerItem"
+			{
+				"windows"	"259"
+				"linux"		"260"
+			}
+			"Weapon_GetSlot"
+			{
+				"windows"	"257"
+				"linux"		"258"
+			}
+			"Ignite"
+			{
+				"windows"	"202"
+				"linux"		"203"
+			}
+			"Extinguish"
+			{
+				"windows"	"206"
+				"linux"		"207"
+			}
+			"Teleport"
+			{
+				"windows"	"105"
+				"linux"		"106"
+			}
+			"CommitSuicide"
+			{
+				"windows"	"426"
+				"linux"		"426"
+			}
+			"GetVelocity"
+			{
+				"windows"	"137"
+				"linux"		"138"
+			}
+			"EyeAngles"
+			{
+				"windows"	"128"
+				"linux"		"129"
+			}
+			"AcceptInput"
+			{
+				"windows"	"34"
+				"linux"		"35"
+			}
+			"DispatchKeyValue"
+			{
+				"windows"	"29"
+				"linux"		"28"
+			}
+			"DispatchKeyValueFloat"
+			{
+				"windows"	"28"
+				"linux"		"29"
+			}
+			"DispatchKeyValueVector"
+			{
+				"windows"	"27"
+				"linux"		"30"
+			}
+			"SetEntityModel"
+			{
+				"windows"	"23"
+				"linux"		"24"
+			}
+			"WeaponEquip"
+			{
+				"windows"	"250"
+				"linux"		"251"
+			}
+			"Activate"
+			{
+				"windows"	"31"
+				"linux"		"32"
+			}
+			"PlayerRunCmd"
+			{
+				"windows"	"404"
+				"linux"		"405"
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/gamedata/sdktools.games/master.games.txt b/gamedata/sdktools.games/master.games.txt
index 205d2dbf..c469c96e 100644
--- a/gamedata/sdktools.games/master.games.txt
+++ b/gamedata/sdktools.games/master.games.txt
@@ -58,6 +58,7 @@
 	"game.cstrike.txt"
 	{
 		"game"		"cstrike"
+		"game"		"cstrike_beta"
 	}
 	
 	"game.hl2mp.txt"
diff --git a/gamedata/sm-cstrike.games.txt b/gamedata/sm-cstrike.games.txt
index 1e5a9f51..39f7c379 100644
--- a/gamedata/sm-cstrike.games.txt
+++ b/gamedata/sm-cstrike.games.txt
@@ -11,8 +11,14 @@
 
 "Games"
 {
-	"cstrike"
+	"#default"
 	{
+		"#supported"
+		{
+			"engine"	"original"
+			"game"		"cstrike"
+		}
+		
 		"Signatures"
 		{
 			"RoundRespawn"
@@ -29,4 +35,30 @@
 			}
 		}
 	}
+	
+	"#default"
+	{
+		"#supported"
+		{
+			"engine"	"orangebox_valve"
+			"game"		"cstrike"
+			"game"		"cstrike_beta"
+		}
+		
+		"Signatures"
+		{
+			"RoundRespawn"
+			{
+				"library"	"server"
+				"windows"	"\x56\x8B\xF1\x8B\x06\x8B\x2A\x2A\x2A\x2A\x2A\xFF\xD2\x8B\x2A\x2A\x2A\x2A\x2A\x85"
+				"linux"		"@_ZN9CCSPlayer12RoundRespawnEv"
+			}
+			"SwitchTeam"
+			{
+				"library"	"server"
+				"windows"	"\x83\xEC\x10\x56\x57\x8B\x7C\x24\x1C\x57\x8B\xF1\xE8\x2A\x2A\x2A\x2A\x83\xC4\x04\x85\xC0\x0F\x2A\x2A\x2A\x2A\x2A\x83\xFF\x03\x74\x09\x83\xFF\x02\x0F\x2A\x2A\x2A\x2A\x2A\x8B\xCE\xE8\x2A\x2A\x2A\x2A\x3B"
+				"linux"		"@_ZN9CCSPlayer10SwitchTeamEi"
+			}
+		}
+	}
 }
\ No newline at end of file