diff --git a/rdesktop.c b/rdesktop.c
index f736ca0..79885bf 100644
--- a/rdesktop.c
+++ b/rdesktop.c
@@ -51,7 +51,7 @@
 char g_title[64] = "";
 char g_username[64];
 char g_hostname[16];
-char keymapname[PATH_MAX] = "";
+char g_keymapname[PATH_MAX] = "";
 int g_keylayout = 0x409;	/* Defaults to US keyboard layout */
 int g_keyboard_type = 0x4;	/* Defaults to US keyboard layout */
 int g_keyboard_subtype = 0x0;	/* Defaults to US keyboard layout */
@@ -464,7 +464,7 @@ main(int argc, char *argv[])
 				break;
 
 			case 'k':
-				STRNCPY(keymapname, optarg, sizeof(keymapname));
+				STRNCPY(g_keymapname, optarg, sizeof(g_keymapname));
 				break;
 
 			case 'g':
@@ -752,15 +752,15 @@ main(int argc, char *argv[])
 		STRNCPY(g_hostname, fullhostname, sizeof(g_hostname));
 	}
 
-	if (keymapname[0] == 0)
+	if (g_keymapname[0] == 0)
 	{
 		if (locale && xkeymap_from_locale(locale))
 		{
-			fprintf(stderr, "Autoselected keyboard map %s\n", keymapname);
+			fprintf(stderr, "Autoselected keyboard map %s\n", g_keymapname);
 		}
 		else
 		{
-			STRNCPY(keymapname, "en-us", sizeof(keymapname));
+			STRNCPY(g_keymapname, "en-us", sizeof(g_keymapname));
 		}
 	}
 	if (locale)
diff --git a/xkeymap.c b/xkeymap.c
index ccca3d1..b892af4 100644
--- a/xkeymap.c
+++ b/xkeymap.c
@@ -40,7 +40,7 @@
 
 extern Display *g_display;
 extern Window g_wnd;
-extern char keymapname[16];
+extern char g_keymapname[16];
 extern int g_keylayout;
 extern int g_keyboard_type;
 extern int g_keyboard_subtype;
@@ -205,7 +205,7 @@ xkeymap_from_locale(const char *locale)
 	if (fp)
 	{
 		fclose(fp);
-		STRNCPY(keymapname, str, sizeof(keymapname));
+		STRNCPY(g_keymapname, str, sizeof(g_keymapname));
 		return True;
 	}
 
@@ -444,9 +444,9 @@ xkeymap_init(void)
 {
 	unsigned int max_keycode;
 
-	if (strcmp(keymapname, "none"))
+	if (strcmp(g_keymapname, "none"))
 	{
-		if (xkeymap_read(keymapname))
+		if (xkeymap_read(g_keymapname))
 			keymap_loaded = True;
 	}