diff --git a/Quake/cl_parse.c b/Quake/cl_parse.c
index bfd95cd8..3f0e9086 100644
--- a/Quake/cl_parse.c
+++ b/Quake/cl_parse.c
@@ -346,6 +346,9 @@ void CL_ParseServerInfo (void)
 // now we try to load everything else until a cache allocation fails
 //
 
+	// copy the naked name of the map file to the cl structure -- O.S
+	COM_StripExtension (COM_SkipPath(model_precache[1]), cl.mapname);
+
 	for (i=1 ; i<nummodels ; i++)
 	{
 		cl.model_precache[i] = Mod_ForName (model_precache[i], false);
diff --git a/Quake/client.h b/Quake/client.h
index ff217d39..9a2dd137 100644
--- a/Quake/client.h
+++ b/Quake/client.h
@@ -207,6 +207,7 @@ typedef struct
 	struct model_s		*model_precache[MAX_MODELS];
 	struct sfx_s		*sound_precache[MAX_SOUNDS];
 
+	char		mapname[128];
 	char		levelname[128];	// for display on solo scoreboard //johnfitz -- was 40.
 	int			viewentity;		// cl_entitites[cl.viewentity] = player
 	int			maxclients;
diff --git a/Quake/host_cmd.c b/Quake/host_cmd.c
index f7441aed..273e968f 100644
--- a/Quake/host_cmd.c
+++ b/Quake/host_cmd.c
@@ -796,6 +796,26 @@ void Host_Map_f (void)
 	int		i;
 	char	name[MAX_QPATH];
 
+	if (Cmd_Argc() < 2)	//no map name given
+	{
+		if (cls.state == ca_dedicated)
+		{
+			if (sv.active)
+				Con_Printf ("Current map: %s\n", sv.name);
+			else
+				Con_Printf ("Server not active\n");
+		}
+		else if (cls.state == ca_connected)
+		{
+			Con_Printf ("Current map: %s ( %s )\n", cl.levelname, cl.mapname);
+		}
+		else
+		{
+			Con_Printf ("map <levelname>: start a new server\n");
+		}
+		return;
+	}
+
 	if (cmd_source != src_command)
 		return;