Index: code/game/g_spawn.c
===================================================================
--- code/game/g_spawn.c	(revision 2067)
+++ code/game/g_spawn.c	(working copy)
@@ -379,9 +379,8 @@
 	}
 }
 
+#define ADJUST_AREAPORTAL() ( if ( ent->s.eType == ET_MOVER ) { trap_LinkEntity( ent ); trap_AdjustAreaPortalState( ent, qtrue ); } )
 
-
-
 /*
 ===================
 G_SpawnGEntityFromSpawnVars
@@ -394,7 +393,7 @@
 	int			i;
 	gentity_t	*ent;
 	char		*s, *value, *gametypeName;
-	static char *gametypeNames[] = {"ffa", "tournament", "single", "team", "ctf", "oneflag", "obelisk", "harvester", "teamtournament"};
+	static char *gametypeNames[] = {"ffa", "tournament", "single", "team", "ctf", "oneflag", "obelisk", "harvester"};
 
 	// get the next free entity
 	ent = G_Spawn();
@@ -407,6 +406,7 @@
 	if ( g_gametype.integer == GT_SINGLE_PLAYER ) {
 		G_SpawnInt( "notsingle", "0", &i );
 		if ( i ) {
+			ADJUST_AREAPORTAL();
 			G_FreeEntity( ent );
 			return;
 		}
@@ -415,12 +415,14 @@
 	if ( g_gametype.integer >= GT_TEAM ) {
 		G_SpawnInt( "notteam", "0", &i );
 		if ( i ) {
+			ADJUST_AREAPORTAL();
 			G_FreeEntity( ent );
 			return;
 		}
 	} else {
 		G_SpawnInt( "notfree", "0", &i );
 		if ( i ) {
+			ADJUST_AREAPORTAL();
 			G_FreeEntity( ent );
 			return;
 		}
@@ -429,12 +431,14 @@
 #ifdef MISSIONPACK
 	G_SpawnInt( "notta", "0", &i );
 	if ( i ) {
+		ADJUST_AREAPORTAL();
 		G_FreeEntity( ent );
 		return;
 	}
 #else
 	G_SpawnInt( "notq3a", "0", &i );
 	if ( i ) {
+		ADJUST_AREAPORTAL();
 		G_FreeEntity( ent );
 		return;
 	}
@@ -446,6 +450,7 @@
 
 			s = strstr( value, gametypeName );
 			if( !s ) {
+				ADJUST_AREAPORTAL();
 				G_FreeEntity( ent );
 				return;
 			}
Index: code/ui/ui_main.c
===================================================================
--- code/ui/ui_main.c	(revision 2067)
+++ code/ui/ui_main.c	(working copy)
@@ -83,8 +83,7 @@
 	"CTF",
 	"1FCTF",
 	"OVERLOAD",
-	"HARVESTER",
-	"TEAMTOURNAMENT"
+	"HARVESTER"
 };
 
 static int const numTeamArenaGameTypes = ARRAY_LEN( teamArenaGameTypes );