diff --git a/src/d_main.cpp b/src/d_main.cpp
index 875f892bf9..343c9c36ae 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -310,8 +310,6 @@ CUSTOM_CVAR(Int, I_FriendlyWindowTitle, 1, CVAR_GLOBALCONFIG|CVAR_ARCHIVE|CVAR_N
 }
 CVAR(Bool, cl_nointros, false, CVAR_ARCHIVE)
 
-
-bool hud_toggled = false;
 bool wantToRestart;
 bool DrawFSHUD;				// [RH] Draw fullscreen HUD?
 bool devparm;				// started game with -devparm
@@ -356,16 +354,18 @@ static int pagetic;
 //
 //==========================================================================
 
+CVAR(Int, saved_screenblocks, 10, CVAR_ARCHIVE)
+CVAR(Bool, saved_drawplayersprite, true, CVAR_ARCHIVE)
+CVAR(Bool, saved_showmessages, true, CVAR_ARCHIVE)
+CVAR(Bool, hud_toggled, false, CVAR_ARCHIVE)
+
 void D_ToggleHud()
 {
-	static int saved_screenblocks;
-	static bool saved_drawplayersprite, saved_showmessages;
-
 	if ((hud_toggled = !hud_toggled))
 	{
-		saved_screenblocks = screenblocks;
-		saved_drawplayersprite = r_drawplayersprites;
-		saved_showmessages = show_messages;
+		saved_screenblocks = *screenblocks;
+		saved_drawplayersprite = *r_drawplayersprites;
+		saved_showmessages = *show_messages;
 		screenblocks = 12;
 		r_drawplayersprites = false;
 		show_messages = false;
@@ -374,9 +374,9 @@ void D_ToggleHud()
 	}
 	else
 	{
-		screenblocks = saved_screenblocks;
-		r_drawplayersprites = saved_drawplayersprite;
-		show_messages = saved_showmessages;
+		screenblocks =*saved_screenblocks;
+		r_drawplayersprites = *saved_drawplayersprite;
+		show_messages = *saved_showmessages;
 	}
 }
 CCMD(togglehud)
diff --git a/src/d_main.h b/src/d_main.h
index 0d4a33079c..b5a08750c2 100644
--- a/src/d_main.h
+++ b/src/d_main.h
@@ -34,7 +34,7 @@
 #include "c_cvars.h"
 
 extern bool		advancedemo;
-extern bool hud_toggled;
+EXTERN_CVAR(Bool, hud_toggled);
 void D_ToggleHud();
 
 struct event_t;