diff --git a/docs/reference.xml b/docs/reference.xml
index de1dba5c..30ae1c89 100644
--- a/docs/reference.xml
+++ b/docs/reference.xml
@@ -1707,6 +1707,12 @@ echo (pstat_weap 0)
 					</arguments>
 				</command>
 
+				<command name="setfollowplayer">
+					<arguments>
+						<argument token="C" description="clientnum" valueNotes="which player to follow"/>
+					</arguments>
+				</command>
+
 				<command name="alive">
 					<description>Returns 1 if the local player is alive.</description>
 					<examples>
diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 7bb3839e..5dd5b6bc 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -1460,6 +1460,21 @@ playerent *updatefollowplayer(int shiftdirection)
     return players[player1->followplayercn];
 }
 
+void setfollowplayer(int cn)
+{
+	// silently ignores invalid player-cn value passed
+	loopv(players) if(players[i])
+    {
+        if(player1->team != TEAM_SPECT && !watchingdemo && m_teammode && team_base(players[i]->team) != team_base(player1->team)) continue;
+		if(players[i]->clientnum == cn)
+		{
+		    if(player1->followplayercn != players[i]->clientnum) addmsg(SV_SPECTCN, "ri", cn);
+			player1->followplayercn = cn;
+		}
+    }
+
+}
+
 // set new spect mode
 void spectate(int mode)
 {
@@ -1526,6 +1541,7 @@ void changefollowplayer(int shift)
 COMMANDN(spectatemode, spectate, ARG_1INT);
 COMMAND(togglespect, ARG_NONE);
 COMMAND(changefollowplayer, ARG_1INT);
+COMMAND(setfollowplayer, ARG_1INT);
 
 int isalive() { return player1->state==CS_ALIVE ? 1 : 0; }
 COMMANDN(alive, isalive, ARG_IVAL);