diff --git a/fgd/base_entity.fgd b/fgd/base_entity.fgd
index 9ec28fd2..c3a838fa 100644
--- a/fgd/base_entity.fgd
+++ b/fgd/base_entity.fgd
@@ -16,6 +16,7 @@
 	// target(target_destination) : "Target" 
 	spawnflags(flags) : "spawnflags" : "Flags that can be set on spawn (i.e. in Hammer Editor)" = []
 
+	gamemodes(integer) : "Gamemodes" : 0
 
 	vscripts[VSCRIPT](scriptlist) : "Entity Scripts" : : "Name(s) of script files that are executed after all entities have spawned."
 	thinkfunction[VSCRIPT](string) : "Script think function" : : "Name of a function in this entity's script scope which will be called automatically."
diff --git a/fgd/bases/BaseEntityBrush.fgd b/fgd/bases/BaseEntityBrush.fgd
index 97f93355..33e4815f 100644
--- a/fgd/bases/BaseEntityBrush.fgd
+++ b/fgd/bases/BaseEntityBrush.fgd
@@ -1,5 +1,5 @@
 @BaseClass
-	base(BaseEntityIO)
+	base(BaseEntityIO, Gamemodes)
 = BaseEntityBrush: "Internal entity. Contains a template for all entity brushes."
 	[
 	targetname(target_source) : "Name" : : "The name that other entities refer to this entity by."
diff --git a/fgd/bases/BaseEntityPoint.fgd b/fgd/bases/BaseEntityPoint.fgd
index 1bbb4414..3c1bac6d 100644
--- a/fgd/bases/BaseEntityPoint.fgd
+++ b/fgd/bases/BaseEntityPoint.fgd
@@ -1,5 +1,5 @@
 @BaseClass
-	base(BaseEntityIO)
+	base(BaseEntityIO, Gamemodes)
 = BaseEntityPoint
 	[
 	targetname(target_source) : "Name" : : "The name that other entities refer to this entity by."
diff --git a/fgd/bases/Gamemodes.fgd b/fgd/bases/Gamemodes.fgd
index 13b2edb9..36758cae 100644
--- a/fgd/bases/Gamemodes.fgd
+++ b/fgd/bases/Gamemodes.fgd
@@ -2,22 +2,20 @@
 	appliesto(MOMENTUM)
 = Gamemodes
 	[
-	gamemode[engine](integer) : "Gamemode" : 0
-	gamemode(choices) : "Gamemode" : 0 =
+	gamemodes(flags) : 0 : "Gamemodes" : "Which gamemodes this entity is active in. If no flags are set, the entity is active in all gamemodes." =
 		[
-		0 : "Unknown"
-		1 : "Surf"
-		2 : "Bhop"
-		3 : "Bhop (HL1)"
-		4 : "Climb (Mom)"
-		5 : "Climb (KZT)"
-		6 : "Climb (1.6)"
-		7 : "RJ"
-		8 : "SJ"
-		9 : "Ahop"
-		10 : "Conc"
-		11 : "Defrag (CPM)"
-		12 : "Defrag (VQ3)"
-		13 : "Defrag (VTG)"
+		1    : "Surf"         : 0
+		2    : "Bhop"         : 0
+		4    : "Bhop (HL1)"   : 0
+		8    : "Climb (Mom)"  : 0
+		16   : "Climb (KZT)"  : 0
+		32   : "Climb (1.6)"  : 0
+		64   : "RJ"           : 0
+		128  : "SJ"           : 0
+		256  : "Ahop"         : 0
+		512  : "Conc"         : 0
+		1024 : "Defrag (CPM)" : 0
+		2048 : "Defrag (VQ3)" : 0
+		4096 : "Defrag (VTG)" : 0
 		]
 	]