diff --git a/reactos/Makefile b/reactos/Makefile
index af786e02ce5..9e69dc33af8 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.176 2003/10/25 20:34:34 gvg Exp $
+# $Id: Makefile,v 1.177 2003/11/01 13:28:53 navaraf Exp $
 #
 # Global makefile
 #
@@ -34,12 +34,16 @@ LIB_FSLIB = vfatlib
 # Static libraries
 LIB_STATIC = string rosrtl epsapi zlib
 
+# Keyboard layout libraries
+DLLS_KBD = kbdus kbdgr kbdfr
+
 # User mode libraries
 # advapi32 cards crtdll fmifs gdi32 kernel32 libpcap packet msafd msvcrt ntdll
 # epsapi psapi richedit rpcrt4 secur32 user32 version ws2help ws2_32 wsock32 wshirda mswsock
 DLLS = advapi32 cards crtdll fmifs freetype gdi32 kernel32 packet lzexpand msafd \
        msvcrt ntdll psapi richedit secur32 syssetup twain user32 version winedbgc \
-       winspool ws2help ws2_32 wsock32 wshirda iphlpapi kbdus mswsock msimg32 d3d8thk
+       winspool ws2help ws2_32 wsock32 wshirda iphlpapi mswsock msimg32 d3d8thk \
+       $(DLLS_KBD)
 
 SUBSYS = smss win32k csrss ntvdm
 
diff --git a/reactos/bootdata/hivesys.inf b/reactos/bootdata/hivesys.inf
index b35c4d98614..8cae9c40010 100644
--- a/reactos/bootdata/hivesys.inf
+++ b/reactos/bootdata/hivesys.inf
@@ -13,8 +13,12 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ComputerName\ComputerName","ComputerName"
 HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","(Default)",0x00000000,"00000409"
 
 ;; Keyboard Layouts
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout File",0x00000000,"kbdgr.dll"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000407","Layout Text",0x00000000,"GR"
 HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000409","Layout File",0x00000000,"kbdus.dll"
 HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000409","Layout Text",0x00000000,"US"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout File",0x00000000,"kbdfr.dll"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout Text",0x00000000,"FR"
 
 ;; NLS Files
 HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","10000",0x00000000,"c_10000.nls"
diff --git a/reactos/bootdata/packages/reactos.dff b/reactos/bootdata/packages/reactos.dff
index 252f57847b6..938314e1084 100755
--- a/reactos/bootdata/packages/reactos.dff
+++ b/reactos/bootdata/packages/reactos.dff
@@ -52,6 +52,8 @@ lib\freetype\freetype.dll               1
 lib\gdi32\gdi32.dll                     1
 lib\iphlpapi\iphlpapi.dll               1
 lib\kbdus\kbdus.dll                     1
+lib\kbdgr\kbdgr.dll                     1
+lib\kbdfr\kbdfr.dll                     1
 lib\kernel32\kernel32.dll               1
 lib\lzexpand\lz32.dll                   1
 lib\msafd\msafd.dll                     1