diff --git a/src/client/cmds.qc b/src/client/cmds.qc
index 395ab1d..af09116 100644
--- a/src/client/cmds.qc
+++ b/src/client/cmds.qc
@@ -18,7 +18,10 @@ int
 ClientGame_ConsoleCommand(void)
 {
 	switch(argv(0)) {
-		default:
+	case "chooseteam":
+		sendevent("HLDM_Chooseteam", "s", argv(1));
+		break;
+	default:
 		return (0);
 	}
 	return (1);
diff --git a/src/client/init.qc b/src/client/init.qc
index 8bd0047..726a638 100644
--- a/src/client/init.qc
+++ b/src/client/init.qc
@@ -25,6 +25,7 @@ void
 ClientGame_Init(float apilevel, string enginename, float engineversion)
 {
 	Obituary_Init();
+	registercommand("chooseteam");
 }
 
 void
diff --git a/src/server/gamerules.h b/src/server/gamerules.h
index e29e025..c4f4cf1 100644
--- a/src/server/gamerules.h
+++ b/src/server/gamerules.h
@@ -40,6 +40,7 @@ class HLMultiplayerRules:HLGameRules
 {
 	int m_iIntermission;
 	int m_iIntermissionTime;
+	string m_strTeamList;
 
 	void(void) HLMultiplayerRules;
 
@@ -52,4 +53,6 @@ class HLMultiplayerRules:HLGameRules
 	virtual void(NSClientPlayer) PlayerDeath;
 	virtual float(NSClientPlayer, string) ConsoleCommand;
 	virtual bool(void) IsMultiplayer;
+	virtual bool(void) IsTeamPlay;
+	virtual void(void) InitPostEnts;
 };
diff --git a/src/server/gamerules_multiplayer.qc b/src/server/gamerules_multiplayer.qc
index 1fb14a9..b81b964 100644
--- a/src/server/gamerules_multiplayer.qc
+++ b/src/server/gamerules_multiplayer.qc
@@ -14,12 +14,49 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+var string autocvar_mp_teamlist = "robo;hgrunt";
+const string mp_teamlist_fallback = "robo;hgrunt";
+
 bool
 HLMultiplayerRules::IsMultiplayer(void)
 {
 	return true;
 }
 
+bool
+HLMultiplayerRules::IsTeamPlay(void)
+{
+	return cvar("mp_teamplay") == 1 ? true : false;
+}
+
+void
+HLMultiplayerRules::InitPostEnts(void)
+{
+	if (IsTeamPlay() == true) {
+		int c;
+
+		/* get the segments from our cvar */
+		m_strTeamList = autocvar_mp_teamlist;
+		c = tokenizebyseparator(m_strTeamList, ";");
+
+		/* if we've got less than 2 teams, use the fallback... */
+		if (c < 2) {
+			m_strTeamList = mp_teamlist_fallback;
+			c = tokenizebyseparator(m_strTeamList, ";");
+		}
+
+		forceinfokey(world, "teams", itos(c));
+
+		/* initialize all dem teams */
+		for (int i = 0; i < c; i++) {
+			forceinfokey(world, sprintf("team_%i", i+1i), argv(i));
+			forceinfokey(world, sprintf("teamscore_%i", i+1i), "0");
+		}
+	} else {
+		forceinfokey(world, "teams", "0");
+	}
+}
+
 void
 HLMultiplayerRules::FrameStart(void)
 {
@@ -143,6 +180,25 @@ HLMultiplayerRules::PlayerSpawn(NSClientPlayer pp)
 	pl.activeweapon = WEAPON_GLOCK;
 	pl.glock_mag = 18;
 	pl.ammo_9mm = 44;
+
+	if (IsTeamPlay() == true) {
+		int c = tokenizebyseparator(m_strTeamList, ";");
+
+		/* not part of a team? pick one of the ones we have */
+		/* TODO: this should sort us into the lowest team */
+		if (pl.team == 0) {
+			pl.team = 1 + floor(random(0, c));
+			forceinfokey(pl, "*team", sprintf("%d", pl.team));
+		}
+
+		/* assign our player model */
+		mymodel = sprintf("models/player/%s/%s.mdl", argv(pl.team - 1), argv(pl.team - 1));
+
+		if (whichpack(mymodel))
+			pl.model = mymodel;
+
+		setmodel(pl, pl.model);
+	}
 #endif
 
 	spot = Spawn_SelectRandom("info_player_deathmatch");
@@ -194,3 +250,30 @@ HLMultiplayerRules::HLMultiplayerRules(void)
 	autocvar(timelimit, 15, "Timelimit for multiplayer rounds");
 	autocvar(fraglimit, 15, "Points limit for multiplayer rounds");
 }
+
+void
+CSEv_HLDM_Chooseteam_s(string teamname)
+{
+	HLGameRules rules = (HLGameRules)g_grMode;
+	player pl = (player)self;
+
+	if (!teamname)
+		return;
+	if (rules.IsMultiplayer() == false)
+		return;
+	if (rules.IsTeamPlay() == false)
+		return;
+	if (pl.health <= 0)
+		return;
+
+	HLMultiplayerRules mprules = (HLMultiplayerRules)rules;
+	int c = tokenizebyseparator(mprules.m_strTeamList, ";");
+
+	for (int i = 0; i < c; i++) {
+		if (argv(i) == teamname) {
+			pl.team = (float)i + 1;
+			forceinfokey(pl, "*team", sprintf("%d", pl.team));
+			Damage_Apply(pl, pl, 100, 0, DMG_SKIP_ARMOR);
+		}
+	}
+}