diff --git a/Quake/cl_main.c b/Quake/cl_main.c
index a707b249..d07b5d53 100644
--- a/Quake/cl_main.c
+++ b/Quake/cl_main.c
@@ -48,6 +48,8 @@ cvar_t	m_side = {"m_side","0.8", CVAR_ARCHIVE};
 cvar_t	cl_maxpitch = {"cl_maxpitch", "90", CVAR_ARCHIVE}; //johnfitz -- variable pitch clamping
 cvar_t	cl_minpitch = {"cl_minpitch", "-90", CVAR_ARCHIVE}; //johnfitz -- variable pitch clamping
 
+cvar_t	cl_startdemos = {"cl_startdemos", "1", CVAR_ARCHIVE};
+
 client_static_t	cls;
 client_state_t	cl;
 // FIXME: put these on hunk?
@@ -824,6 +826,8 @@ void CL_Init (void)
 	Cvar_RegisterVariable (&cl_maxpitch); //johnfitz -- variable pitch clamping
 	Cvar_RegisterVariable (&cl_minpitch); //johnfitz -- variable pitch clamping
 
+	Cvar_RegisterVariable (&cl_startdemos);
+
 	Cmd_AddCommand ("entities", CL_PrintEntities_f);
 	Cmd_AddCommand ("disconnect", CL_Disconnect_f);
 	Cmd_AddCommand ("record", CL_Record_f);
diff --git a/Quake/client.h b/Quake/client.h
index 1c7db181..e1301d9d 100644
--- a/Quake/client.h
+++ b/Quake/client.h
@@ -264,6 +264,8 @@ extern	cvar_t	m_yaw;
 extern	cvar_t	m_forward;
 extern	cvar_t	m_side;
 
+extern	cvar_t	cl_startdemos;
+
 
 #define	MAX_TEMP_ENTITIES	256		//johnfitz -- was 64
 #define	MAX_STATIC_ENTITIES	4096	//ericw -- was 512	//johnfitz -- was 128
diff --git a/Quake/host_cmd.c b/Quake/host_cmd.c
index 94ecbb09..14e1023a 100644
--- a/Quake/host_cmd.c
+++ b/Quake/host_cmd.c
@@ -2222,7 +2222,7 @@ static void Host_Startdemos_f (void)
 	if (!sv.active && cls.demonum != -1 && !cls.demoplayback)
 	{
 		cls.demonum = 0;
-		if (!fitzmode)
+		if (!fitzmode && !cl_startdemos.value)
 		{  /* QuakeSpasm customization: */
 			/* go straight to menu, no CL_NextDemo */
 			cls.demonum = -1;
diff --git a/Quake/menu.c b/Quake/menu.c
index c04c0b8c..db10144a 100644
--- a/Quake/menu.c
+++ b/Quake/menu.c
@@ -281,7 +281,7 @@ void M_Main_Key (int key)
 		key_dest = key_game;
 		m_state = m_none;
 		cls.demonum = m_save_demonum;
-		if (!fitzmode)	/* QuakeSpasm customization: */
+		if (!fitzmode && !cl_startdemos.value)	/* QuakeSpasm customization: */
 			break;
 		if (cls.demonum != -1 && !cls.demoplayback && cls.state != ca_connected)
 			CL_NextDemo ();