diff --git a/libfreerdp/locale/keyboard_apple.c b/libfreerdp/locale/keyboard_apple.c
index ea77293e9..936423315 100644
--- a/libfreerdp/locale/keyboard_apple.c
+++ b/libfreerdp/locale/keyboard_apple.c
@@ -51,7 +51,7 @@ static const KEYBOARD_LAYOUT_MAPPING KEYBOARD_MAPPING_TABLE[] = {
 	{ "com.apple.keylayout.AfghanDari", KBD_PERSIAN },
 	{ "com.apple.keylayout.AfghanPashto", PASHTO },
 	{ "com.apple.keylayout.AfghanUzbek", UZBEK_LATIN },
-	{ "com.apple.keylayout.Arabic", ARABIC_EGYPT },
+	{ "com.apple.keylayout.Arabic", ARABIC_SAUDI_ARABIA },
 	{ "com.apple.keylayout.Arabic-QWERTY", ARABIC_EGYPT },
 	{ "com.apple.keylayout.ArabicPC", ARABIC_EGYPT },
 	{ "com.apple.keylayout.Armenian-HMQWERTY", ARMENIAN },
@@ -140,7 +140,7 @@ static const KEYBOARD_LAYOUT_MAPPING KEYBOARD_MAPPING_TABLE[] = {
 	{ "com.apple.keylayout.Oriya", ORIYA },
 	{ "com.apple.keylayout.Persian", KBD_PERSIAN },
 	{ "com.apple.keylayout.Persian-ISIRI2901", KBD_PERSIAN },
-	{ "com.apple.keylayout.Polish", KBD_POLISH_214 },
+	{ "com.apple.keylayout.Polish", KBD_POLISH_PROGRAMMERS },
 	{ "com.apple.keylayout.PolishPro", KBD_UNITED_STATES_INTERNATIONAL },
 	{ "com.apple.keylayout.Portuguese", PORTUGUESE_STANDARD },
 	{ "com.apple.keylayout.Romanian", KBD_ROMANIAN },
diff --git a/libfreerdp/locale/xkb_layout_ids.c b/libfreerdp/locale/xkb_layout_ids.c
index ee6a508bd..3e0e03bb6 100644
--- a/libfreerdp/locale/xkb_layout_ids.c
+++ b/libfreerdp/locale/xkb_layout_ids.c
@@ -793,7 +793,7 @@ static const XKB_LAYOUT xkbLayouts[] = {
 	{ "mt", KBD_MALTESE_48_KEY, mt_variants },                   /* Malta */
 	{ "mn", KBD_MONGOLIAN_CYRILLIC, NULL },                      /* Mongolia */
 	{ "no", KBD_NORWEGIAN, no_variants },                        /* Norway */
-	{ "pl", KBD_POLISH_214, pl_variants },                       /* Poland */
+	{ "pl", KBD_POLISH_PROGRAMMERS, pl_variants },               /* Poland */
 	{ "pt", KBD_PORTUGUESE, pt_variants },                       /* Portugal */
 	{ "ro", KBD_ROMANIAN, ro_variants },                         /* Romania */
 	{ "ru", KBD_RUSSIAN, ru_variants },                          /* Russia */