diff --git a/Quake/cl_main.c b/Quake/cl_main.c
index 5dfd7605..b0883d5b 100644
--- a/Quake/cl_main.c
+++ b/Quake/cl_main.c
@@ -33,6 +33,8 @@ cvar_t	cl_color = {"_cl_color", "0", CVAR_ARCHIVE};
 cvar_t	cl_shownet = {"cl_shownet","0",CVAR_NONE};	// can be 0, 1, or 2
 cvar_t	cl_nolerp = {"cl_nolerp","0",CVAR_NONE};
 
+cvar_t	cfg_unbindall = {"cfg_unbindall", "1", CVAR_ARCHIVE};
+
 cvar_t	lookspring = {"lookspring","0", CVAR_ARCHIVE};
 cvar_t	lookstrafe = {"lookstrafe","0", CVAR_ARCHIVE};
 cvar_t	sensitivity = {"sensitivity","3", CVAR_ARCHIVE};
@@ -797,6 +799,8 @@ void CL_Init (void)
 	Cvar_RegisterVariable (&m_forward);
 	Cvar_RegisterVariable (&m_side);
 
+	Cvar_RegisterVariable (&cfg_unbindall);
+
 	Cvar_RegisterVariable (&cl_maxpitch); //johnfitz -- variable pitch clamping
 	Cvar_RegisterVariable (&cl_minpitch); //johnfitz -- variable pitch clamping
 
diff --git a/Quake/client.h b/Quake/client.h
index b4d5761b..3621dff4 100644
--- a/Quake/client.h
+++ b/Quake/client.h
@@ -245,6 +245,8 @@ extern	cvar_t	cl_autofire;
 extern	cvar_t	cl_shownet;
 extern	cvar_t	cl_nolerp;
 
+extern	cvar_t	cfg_unbindall;
+
 extern	cvar_t	cl_pitchdriftspeed;
 extern	cvar_t	lookspring;
 extern	cvar_t	lookstrafe;
diff --git a/Quake/host.c b/Quake/host.c
index 20b046e8..1ce6008a 100644
--- a/Quake/host.c
+++ b/Quake/host.c
@@ -81,8 +81,6 @@ cvar_t	developer = {"developer","0",CVAR_NONE};
 
 cvar_t	temp1 = {"temp1","0",CVAR_NONE};
 
-cvar_t	cfg_unbindall = {"cfg_unbindall", "1", CVAR_ARCHIVE}; //QuakeSpasm
-
 cvar_t devstats = {"devstats","0",CVAR_NONE}; //johnfitz -- track developer statistics that vary every frame
 
 devstats_t dev_stats, dev_peakstats;
@@ -276,8 +274,6 @@ void Host_InitLocal (void)
 
 	Cvar_RegisterVariable (&temp1);
 
-	Cvar_RegisterVariable (&cfg_unbindall); //QuakeSpasm
-
 	Host_FindMaxClients ();
 
 	host_time = 1.0;		// so a think at time 0 won't get called
@@ -308,8 +304,6 @@ void Host_WriteConfiguration (void)
 
 		VID_SyncCvars (); //johnfitz -- write actual current mode to config file, in case cvars were messed with
 
-		if (cfg_unbindall.value) fprintf (f, "unbindall\n"); //QuakeSpasm -- unbindall before loading stored bindings
-
 		Key_WriteBindings (f);
 		Cvar_WriteVariables (f);
 
diff --git a/Quake/keys.c b/Quake/keys.c
index 529857c0..761840a7 100644
--- a/Quake/keys.c
+++ b/Quake/keys.c
@@ -712,6 +712,9 @@ void Key_WriteBindings (FILE *f)
 {
 	int	i;
 
+	// unbindall before loading stored bindings:
+	if (cfg_unbindall.value)
+		fprintf (f, "unbindall\n");
 	for (i = 0; i < 256; i++)
 	{
 		if (keybindings[i] && *keybindings[i])
@@ -796,8 +799,7 @@ void Key_Init (void)
 {
 	int	i;
 
-	History_Init ();
-#if 0 /* This section of code is now done in History_Init */
+#if 0 /* moved to History_Init() */
 	for (i = 0; i < 32; i++)
 	{
 		key_lines[i][0] = ']';
@@ -805,6 +807,7 @@ void Key_Init (void)
 	}
 	key_linepos = 1;
 #endif
+	History_Init ();
 
 	key_blinktime = realtime; //johnfitz