diff --git a/src/locale/en.po b/src/locale/en.po
index 2665082a2..517ad4881 100644
--- a/src/locale/en.po
+++ b/src/locale/en.po
@@ -3629,7 +3629,7 @@ msgid "another castle!"
 msgstr ""
 
 #: st_stuff.c:2328 st_stuff.c:2334 st_stuff.c:2356
-msgid "Press F12 to watch another player."
+msgid "Press Viewpoint to watch another player."
 msgstr ""
 
 #: st_stuff.c:2333
diff --git a/src/locale/srb2.pot b/src/locale/srb2.pot
index 37d14f8b7..46c13cc29 100644
--- a/src/locale/srb2.pot
+++ b/src/locale/srb2.pot
@@ -3820,7 +3820,7 @@ msgid "another castle!"
 msgstr ""
 
 #: st_stuff.c:2092 st_stuff.c:2098 st_stuff.c:2120
-msgid "Press F12 to watch another player."
+msgid "Press Viewpoint to watch another player."
 msgstr ""
 
 #: st_stuff.c:2097
diff --git a/src/st_stuff.c b/src/st_stuff.c
index f2e62feda..15ff8d642 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -28,6 +28,7 @@
 #include "m_menu.h"
 #include "m_cheat.h"
 #include "p_setup.h" // NiGHTS grading
+#include "g_input.h" // Viewpoint string
 
 //random index
 #include "m_random.h"
@@ -1870,13 +1871,23 @@ static void ST_overlayDrawer(void)
 
 	if (!hu_showscores && !splitscreen && netgame && displayplayer == consoleplayer)
 	{
+		// Build the control string for viewpoint switching
+		// Longest control string goes to WII's DBLSEC_JOYMINUS_CC, at 18 chars
+		char secondcontrol[4+20];
+		char viewpointprompt[32+20];
+		if (gamecontrol[gc_viewpoint][1])
+			snprintf(secondcontrol, 3+20, " or %s", G_KeynumToString(gamecontrol[gc_viewpoint][1]));
+		else
+			secondcontrol[0] = 0;
+		snprintf(viewpointprompt, 32+20, "Press %s%s to watch another player.", G_KeynumToString(gamecontrol[gc_viewpoint][0]), secondcontrol);
+
 		if (G_GametypeUsesLives() && stplyr->lives <= 0 && countdown != 1)
-			V_DrawCenteredString(BASEVIDWIDTH/2, STRINGY(132), 0, M_GetText("Press F12 to watch another player."));
+			V_DrawCenteredString(BASEVIDWIDTH/2, STRINGY(132), 0, M_GetText(viewpointprompt));
 		else if (gametype == GT_HIDEANDSEEK &&
 		 (!stplyr->spectator && !(stplyr->pflags & PF_TAGIT)) && (leveltime > hidetime * TICRATE))
 		{
 			V_DrawCenteredString(BASEVIDWIDTH/2, STRINGY(116), 0, M_GetText("You cannot move while hiding."));
-			V_DrawCenteredString(BASEVIDWIDTH/2, STRINGY(132), 0, M_GetText("Press F12 to watch another player."));
+			V_DrawCenteredString(BASEVIDWIDTH/2, STRINGY(132), 0, M_GetText(viewpointprompt));
 		}
 		else if (!G_PlatformGametype() && stplyr->playerstate == PST_DEAD && stplyr->lives) //Death overrides spectator text.
 		{
@@ -1899,7 +1910,7 @@ static void ST_overlayDrawer(void)
 				V_DrawCenteredString(BASEVIDWIDTH/2, STRINGY(132), V_HUDTRANSHALF, M_GetText("You cannot join the game until the stage has ended."));
 			else
 				V_DrawCenteredString(BASEVIDWIDTH/2, STRINGY(132), V_HUDTRANSHALF, M_GetText("Press Fire to enter the game."));
-			V_DrawCenteredString(BASEVIDWIDTH/2, STRINGY(148), V_HUDTRANSHALF, M_GetText("Press F12 to watch another player."));
+			V_DrawCenteredString(BASEVIDWIDTH/2, STRINGY(148), V_HUDTRANSHALF, M_GetText(viewpointprompt));
 			V_DrawCenteredString(BASEVIDWIDTH/2, STRINGY(164), V_HUDTRANSHALF, M_GetText("Press Jump to float and Spin to sink."));
 		}
 	}