diff --git a/docs/man/xrdp-genkeymap.8 b/docs/man/xrdp-genkeymap.8
index 068f04dd..9c839187 100644
--- a/docs/man/xrdp-genkeymap.8
+++ b/docs/man/xrdp-genkeymap.8
@@ -21,35 +21,35 @@ The key map information is stored in the file named \fIoutfile\fP.
 
 .SH "FILES"
 .TP
-.I /etc/xrdp/km-XXXX.ini
-Files containing the keyboard mapping for language \fIXXXX\fP, which is a 4 digit hexadecimal number identifying the country and language code.
+.I /etc/xrdp/km-XXXXXXXX.ini
+Files containing the keyboard mapping for language \fIXXXXXXXX\fP, which is a 8 digit hexadecimal number identifying the country and language code.
 .RS 8
 .TP
-.B 0405
+.B 00000405
 cs czech
 .TP
-.B 0407
+.B 00000407
 de german
 .TP
-.B 0409
+.B 00000409
 en-us us english
 .TP
-.B 040c
+.B 0000040c
 fr french
 .TP
-.B 0410
+.B 00000410
 it italy
 .TP
-.B 0416
+.B 00000416
 br Portuguese (Brazil)
 .TP
-.B 0419
+.B 00000419
 ru russian
 .TP
-.B 041d
+.B 0000041d
 se swedish
 .TP
-.B 0809
+.B 00000809
 en-uk uk english
 .RE
 
diff --git a/file-loc.txt b/file-loc.txt
index 8c67a92c..98894465 100644
--- a/file-loc.txt
+++ b/file-loc.txt
@@ -25,7 +25,7 @@ default build will install the following
   xrdp-chansrv
 
 /etc/xrdp
-  km-xxxx.ini
+  km-xxxxxxxx.ini
   sesman.ini
   rsakeys.ini
   startwm.sh
diff --git a/genkeymap/dump-keymaps.sh b/genkeymap/dump-keymaps.sh
index 5aed9d0e..23c12eca 100755
--- a/genkeymap/dump-keymaps.sh
+++ b/genkeymap/dump-keymaps.sh
@@ -7,44 +7,44 @@ then
   exit 1
 fi
 
-# English - US 'en-us' 0x0409
+# English - US 'en-us' 0x00000409
 setxkbmap -model pc104 -layout us
-./xrdp-genkeymap ../instfiles/km-0409.ini
+./xrdp-genkeymap ../instfiles/km-00000409.ini
 
-# English - UK 'en-GB' 0x0809
+# English - UK 'en-GB' 0x00000809
 setxkbmap -model pc105 -layout gb
-./xrdp-genkeymap ../instfiles/km-0809.ini
+./xrdp-genkeymap ../instfiles/km-00000809.ini
 
-# German 'de' 0x0407
+# German 'de' 0x00000407
 setxkbmap -model pc104 -layout de
-./xrdp-genkeymap ../instfiles/km-0407.ini
+./xrdp-genkeymap ../instfiles/km-00000407.ini
 
-# Italy 'it' 0x0410
+# Italy 'it' 0x00000410
 setxkbmap -model pc104 -layout it
-./xrdp-genkeymap ../instfiles/km-0410.ini
+./xrdp-genkeymap ../instfiles/km-00000410.ini
 
-# Japanese 'jp' 0x0411
+# Japanese 'jp' 0x00000411
 setxkbmap -model jp106 -layout jp -variant OADG109A
-./xrdp-genkeymap ../instfiles/km-0411.ini
+./xrdp-genkeymap ../instfiles/km-00000411.ini
 ./xrdp-genkeymap ../instfiles/km-e0010411.ini
 ./xrdp-genkeymap ../instfiles/km-e0200411.ini
 ./xrdp-genkeymap ../instfiles/km-e0210411.ini
 
-# Polish 'pl' 0x0415
+# Polish 'pl' 0x00000415
 setxkbmap -model pc104 -layout pl
-./xrdp-genkeymap ../instfiles/km-0415.ini
+./xrdp-genkeymap ../instfiles/km-00000415.ini
 
-# Russia 'ru' 0x0419
+# Russia 'ru' 0x00000419
 setxkbmap -model pc104 -layout ru
-./xrdp-genkeymap ../instfiles/km-0419.ini
+./xrdp-genkeymap ../instfiles/km-00000419.ini
 
-# Sweden 'se' 0x041d
+# Sweden 'se' 0x0000041d
 setxkbmap -model pc104 -layout se
-./xrdp-genkeymap ../instfiles/km-041d.ini
+./xrdp-genkeymap ../instfiles/km-0000041d.ini
 
-# Portuguese -PT 'pt-pt' 0x0816
+# Portuguese -PT 'pt-pt' 0x00000816
 setxkbmap -model pc104 -layout pt
-./xrdp-genkeymap ../instfiles/km-0816.ini
+./xrdp-genkeymap ../instfiles/km-00000816.ini
 
 # set back to en-us
 setxkbmap -model pc104 -layout us
diff --git a/genkeymap/genkeymap.c b/genkeymap/genkeymap.c
index d0907f32..1d640b1f 100644
--- a/genkeymap/genkeymap.c
+++ b/genkeymap/genkeymap.c
@@ -73,7 +73,7 @@ int main(int argc, char **argv)
     if (argc != 2)
     {
         fprintf(stderr, "Usage: %s out_filename\n", programname);
-        fprintf(stderr, "Example: %s /etc/xrdp/km-0409.ini\n", programname);
+        fprintf(stderr, "Example: %s /etc/xrdp/km-00000409.ini\n", programname);
         return 1;
     }
 
diff --git a/genkeymap/readme.txt b/genkeymap/readme.txt
index b2b3b890..242fe92e 100644
--- a/genkeymap/readme.txt
+++ b/genkeymap/readme.txt
@@ -3,9 +3,9 @@ Creating a new keymap file.
 
 The names of the files are of the format;
 
-km-xxxx.ini
+km-xxxxxxxx.ini
 
-where the xxxx is replaced by the hex number of the layout of interest.
+where the xxxxxxxx is replaced by the hex number of the layout of interest.
 
 The files have 8 sections;
 
@@ -33,7 +33,7 @@ Key63=65450:42
 
 To create a new file run "xrdp-genkeymap <filename>"
 
-Example: ./xrdp-genkeymap /etc/xrdp/km-0409.ini
+Example: ./xrdp-genkeymap /etc/xrdp/km-00000409.ini
 
 Note: You need to have enough rights to be able to write to the
 /etc/xrdp directory.