diff --git a/reactos/Makefile b/reactos/Makefile
index 48d392a0747..ee5d862c07f 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -38,13 +38,13 @@ BUS = acpi isapnp pci
 
 # Filesystem libraries
 # vfatlib
-LIB_FSLIB = vfatlib
+LIB_FSLIB = vfatlib ext2lib
 
 # Static libraries
 LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh adns dxguid strmiids
 
 # Keyboard layout libraries
-DLLS_KBD = kbdda kbddv kbdfr kbdgr kbdse kbduk kbdus 
+DLLS_KBD = kbdda kbddv kbdes kbdfr kbdgr kbdse kbduk kbdus
 
 # Control Panels
 DLLS_CPL = cpl
@@ -83,7 +83,7 @@ INPUT_DRIVERS = keyboard mouclass psaux sermouse
 
 # Kernel mode file system drivers
 # cdfs ext2 fs_rec ms np vfat
-FS_DRIVERS = cdfs fs_rec ms np vfat mup ntfs
+FS_DRIVERS = cdfs fs_rec ms np vfat ext2 mup ntfs
 
 # Kernel mode networking drivers
 # afd ndis npf tcpip tdi wshtcpip
diff --git a/reactos/bootdata/packages/reactos.dff b/reactos/bootdata/packages/reactos.dff
index 2e6ba00968a..98682b1dfaa 100755
--- a/reactos/bootdata/packages/reactos.dff
+++ b/reactos/bootdata/packages/reactos.dff
@@ -85,6 +85,7 @@ lib\imm32\imm32.dll                     1
 lib\iphlpapi\iphlpapi.dll               1
 lib\kbdda\kbdda.dll                     1
 lib\kbddv\kbddv.dll                     1
+lib\kbdes\kbdes.dll                     1
 lib\kbdfr\kbdfr.dll                     1
 lib\kbdgr\kbdgr.dll                     1
 lib\kbdse\kbdse.dll                     1
diff --git a/reactos/bootdata/txtsetup.sif b/reactos/bootdata/txtsetup.sif
index 3a3203ec1bc..94b79095894 100644
--- a/reactos/bootdata/txtsetup.sif
+++ b/reactos/bootdata/txtsetup.sif
@@ -29,14 +29,15 @@ ntfs.sys      = 3
 ntoskrnl.exe  = 2
 scsiport.sys  = 3
 vfatfs.sys    = 3
+ext2.sys      = 3
 
 [Cabinets]
 Cabinet=reactos.cab
 
 [SetupData]
 DefaultPath = \ReactOS
-OsLoadOptions = "/NOGUIBOOT /NODEBUG"
-;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1"
+;OsLoadOptions = "/NOGUIBOOT /NODEBUG"
+OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1"
 ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=SCREEN"
 ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS"
 
@@ -69,6 +70,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)"
 00010409 = "English (USA-Dvorak)"
 0000040C = "French (France)"
 00000407 = "German (Germany)"
+0000040A = "Spanish (traditional short)"
 0000041D = "Swedish (Sweden)"
 
 [Files.KeyboardLayout]
@@ -79,6 +81,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)"
 0000040C = kbdfr.dll
 0000041D = kbdse.dll
 00000809 = kgbgb.dll
+0000040A = kbdes.dll
 
 [Mouse]
 ;<id> = <user friendly name>,<spare>,<service key name>
diff --git a/reactos/lib/kbdes/kbdes.c b/reactos/lib/kbdes/kbdes.c
new file mode 100644
index 00000000000..872efe7ebc1
--- /dev/null
+++ b/reactos/lib/kbdes/kbdes.c
@@ -0,0 +1,398 @@
+   /*
+    * ReactOS ESASCII Keyboard layout
+    * Copyright (C) 2003 ReactOS
+    * License: LGPL, see: LGPL.txt
+    * Created by HUMA2000 from kbdus, kbdgr and kbdfr
+    * huma2000@terra.es
+    *
+    * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php
+    * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html
+    */
+
+   #include <windows.h>
+   #include <internal/kbd.h>
+   #ifdef _M_IA64
+   #define ROSDATA static __declspec(allocate(".data"))
+   #else
+   #pragma data_seg(".data")
+   #define ROSDATA static
+   #endif
+
+   #define VK_EMPTY 0xff   /* The non-existent VK */
+   #define KSHIFT   0x001  /* Shift modifier */
+   #define KCTRL    0x002  /* Ctrl modifier */
+   #define KALT     0x004  /* Alt modifier */
+   #define KEXT     0x100  /* Extended key code */
+   #define KMULTI   0x200  /* Multi-key */
+   #define KSPEC    0x400  /* Special key */
+   #define KNUMP    0x800  /* Number-pad */
+   #define KNUMS    0xc00  /* Special + number pad */
+   #define KMEXT    0x300  /* Multi + ext */
+   /* Thanks to http://asp.flaaten.dk/pforum/keycode/keycode.htm */
+   #ifndef VK_OEM_1
+   #define VK_OEM_1  0xba
+   #endif
+   #ifndef VK_OEM_PLUS
+   #define VK_OEM_PLUS 0xbb
+   #endif
+   #ifndef VK_OEM_COMMA
+   #define VK_OEM_COMMA 0xbc
+   #endif
+   #ifndef VK_OEM_MINUS
+   #define VK_OEM_MINUS 0xbd
+   #endif
+   #ifndef VK_OEM_PERIOD
+   #define VK_OEM_PERIOD 0xbe
+   #endif
+   #ifndef VK_OEM_2
+   #define VK_OEM_2 0xbf
+   #endif
+   #ifndef VK_OEM_3
+   #define VK_OEM_3 0xc0
+   #endif
+   #ifndef VK_OEM_4
+   #define VK_OEM_4 0xdb
+   #endif
+   #ifndef VK_OEM_5
+   #define VK_OEM_5 0xdc
+   #endif
+   #ifndef VK_OEM_6
+   #define VK_OEM_6 0xdd
+   #endif
+   #ifndef VK_OEM_7
+   #define VK_OEM_7 0xde
+   #endif
+   #ifndef VK_OEM_8
+   #define VK_OEM_8 0xdf
+   #endif
+   #ifndef VK_OEM_102
+   #define VK_OEM_102 0xe1
+   #endif
+   #ifndef VK_acentos
+   #define VK_acentos 0x0e
+   #endif
+
+   ROSDATA USHORT scancode_to_vk[] = {
+     /* Numbers Row */
+     /* - 00 - */
+     /* 1 ...         2 ...         3 ...         4 ... */
+     VK_acentos,     '1',          '2',
+     '3',          '4',          '5',          '6',
+     '7',          '8',          '9',          '0',
+     VK_OEM_MINUS, VK_OEM_PLUS,  VK_BACK,
+     /* - 0f - */
+     /* First Letters Row */
+     VK_TAB,       'Q',          'W',          'E',
+     'R',          'T',          'Y',          'U',
+     'I',          'O',          'P',
+     VK_OEM_4,     VK_OEM_6,     VK_RETURN,
+     /* - 1d - */
+     /* Second Letters Row */
+     VK_LCONTROL,
+     'A',          'S',          'D',          'F',
+     'G',          'H',          'J',          'K',
+     'L',          'Ñ',     VK_OEM_7,     VK_OEM_3,
+     VK_LSHIFT,    VK_OEM_5,
+     /* - 2c - */
+     /* Third letters row */
+     VK_OEM_102,   'Z',          'X',          'C',          'V',
+     'B',          'N',          'M',          VK_OEM_COMMA,
+     VK_OEM_PERIOD, VK_OEM_2,     VK_RSHIFT,
+     /* - 37 - */
+     /* Bottom Row */
+     VK_MULTIPLY,  VK_LMENU,     VK_SPACE,     VK_CAPITAL,
+     /* - 3b - */
+     /* F-Keys */
+     VK_ESCAPE, VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6,
+     VK_F7, VK_F8, VK_F9, VK_F10,
+     /* - 45 - */
+     /* Locks */
+     VK_NUMLOCK | KMEXT,
+     VK_SCROLL | KMULTI,
+     /* - 47 - */
+     /* Number-Pad */
+     VK_HOME | KNUMS,      VK_UP | KNUMS,         VK_PRIOR | KNUMS,
+   VK_SUBTRACT,
+     VK_LEFT | KNUMS,      VK_CLEAR | KNUMS,      VK_RIGHT | KNUMS,   VK_ADD,
+     VK_END | KNUMS,       VK_DOWN | KNUMS,       VK_NEXT | KNUMS,
+     VK_INSERT | KNUMS,    VK_DELETE | KNUMS,
+     /* - 54 - */
+     /* Presumably PrtSc */
+     VK_SNAPSHOT,
+     /* - 55 - */
+     /* Oddities, and the remaining standard F-Keys */
+     VK_EMPTY,     VK_EMPTY,     VK_F11,       VK_F12,
+     /* - 59 - */
+     VK_CLEAR,     VK_EMPTY,     VK_EMPTY,     VK_EMPTY,     VK_EMPTY, /*
+   EREOF */
+     VK_EMPTY,     VK_EMPTY,     VK_EMPTY,     VK_EMPTY,     VK_EMPTY, /*   ZOOM */
+     VK_HELP,
+     /* - 64 - */
+     /* Even more F-Keys (for example, NCR keyboards from the early 90's)
+   */
+     VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20,
+     VK_F21, VK_F22, VK_F23,
+     /* - 6f - */
+     /* Not sure who uses these codes */
+     VK_EMPTY, VK_EMPTY, VK_EMPTY,
+     /* - 72 - */
+     VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
+     /* - 76 - */
+     /* One more f-key */
+     VK_F24,
+     /* - 77 - */
+     VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY,
+     VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */
+     VK_EMPTY,
+     /* - 80 - */
+     0
+   };
+   ROSDATA VSC_VK extcode0_to_vk[] = {
+     { 0, 0 },
+   };
+
+   ROSDATA VSC_VK extcode1_to_vk[] = {
+     { 0, 0 },
+   };
+   ROSDATA VK_TO_BIT modifier_keys[] = {
+     { VK_SHIFT,   KSHIFT },
+     { VK_CONTROL, KCTRL },
+     { VK_MENU,    KALT },
+     { 0,          0 }
+   };
+
+   typedef struct _mymod {
+     PVOID mod_keys;
+     WORD maxmod;
+     BYTE mod_max[4];
+   } INTERNAL_KBD_MODIFIERS;
+   ROSDATA INTERNAL_KBD_MODIFIERS modifier_bits[] = {
+     modifier_keys,
+     3,
+     { 0, 1, 2, 3 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT */
+   };
+
+   #define NOCAPS 0
+   #define CAPS   KSHIFT /* Caps -> shift */
+   ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = {
+     /* Normal vs Shifted */
+     /* The numbers */
+     //Del 1 al 5 tienen tres estados
+     { '4',         NOCAPS, '4', '$' },
+     //El 6 tiene 3 estados
+     { '7',         NOCAPS, '7', '&' },
+     { '8',         NOCAPS, '8', '*' },
+     { '9',         NOCAPS, '9', '(' },
+     { '0',         NOCAPS, '0', ')' },
+     /* First letter row */
+     { 'Q',         CAPS,   'q', 'Q' },
+     { 'W',         CAPS,   'w', 'W' },
+     //La E tiene 3 estados
+     { 'R',         CAPS,   'r', 'R' },
+     { 'T',         CAPS,   't', 'T' },
+     { 'Y',         CAPS,   'y', 'Y' },
+     { 'U',         CAPS,   'u', 'U' },
+     { 'I',         CAPS,   'i', 'I' },
+     { 'O',         CAPS,   'o', 'O' },
+     { 'P',         CAPS,   'p', 'P' },
+     /* Second letter row */
+     { 'A',         CAPS,   'a', 'A' },
+     { 'S',         CAPS,   's', 'S' },
+     { 'D',         CAPS,   'd', 'D' },
+     { 'F',         CAPS,   'f', 'F' },
+     { 'G',         CAPS,   'g', 'G' },
+     { 'H',         CAPS,   'h', 'H' },
+     { 'J',         CAPS,   'j', 'J' },
+     { 'K',         CAPS,   'k', 'K' },
+     { 'L',         CAPS,   'l', 'L' },
+     { 'Ñ',         CAPS,   'ñ', 'Ñ' }, //No se si funcionara así
+     /* Third letter row */
+     { 'Z',         CAPS,   'z', 'Z' },
+     { 'X',         CAPS,   'x', 'X' },
+     { 'C',         CAPS,   'c', 'C' },
+     { 'V',         CAPS,   'v', 'V' },
+     { 'B',         CAPS,   'b', 'B' },
+     { 'N',         CAPS,   'n', 'N' },
+     { 'M',         CAPS,   'm', 'M' },
+
+     /* Specials */
+     /* Ctrl-_ generates ES */
+     { VK_OEM_PLUS    ,NOCAPS, '=', '+' },
+     { VK_OEM_1       ,NOCAPS, ';', ':' },
+     { VK_OEM_COMMA   ,NOCAPS, ',', ';' },
+     { VK_OEM_PERIOD  ,NOCAPS, '.', ':' },
+     { VK_OEM_2       ,NOCAPS, '-', '_' },
+     { VK_OEM_102     ,NOCAPS, '<', '>' },
+     /* Keys that do not have shift states */
+     { VK_TAB     ,NOCAPS, '\t','\t'},
+     { VK_ADD     ,NOCAPS, '+', '+' },
+     { VK_SUBTRACT,NOCAPS, '-', '-' },
+     { VK_MULTIPLY,NOCAPS, '*', '*' },
+     { VK_DIVIDE  ,NOCAPS, '/', '/' },
+     { VK_ESCAPE  ,NOCAPS, '\x1b','\x1b' },
+     { VK_SPACE   ,NOCAPS, ' ', ' ' },
+     { 0, 0 }
+   };
+
+   ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = {
+     /* Normal, Shifted, Ctrl */
+     /* Legacy (telnet-style) ascii escapes */
+     { '1', NOCAPS, '1', '!', '|' }, // ¿Funcionara?
+     { '2', NOCAPS, '2', '"', '@' }, // ¿Funcionara?
+     { '3', NOCAPS, '3', '·','#' }, // ¿Funcionara?
+     { '5', NOCAPS, '5', '%', 0x20AC }, // añadir caracter EUR, asi no va   a funcionar
+     { '6', NOCAPS, '6', '&', '¬' }, // ¿Funcionara?
+     { 'E', CAPS,   'e', 'E', 0x20AC }, // añadir caracter EUR, asi no va a funcionar
+     { VK_OEM_4, 0, '[', '{', 0x1b /* ESC */ },
+     { VK_OEM_6, 0, ']', '}', 0x1d /* GS */ },
+     { VK_OEM_5, 0, '\\','|', 0x1c /* FS */ },
+     { VK_RETURN,0, '\r', '\r', '\n' },
+     { VK_OEM_7   ,NOCAPS, '´','¨','{'},     // Tecla ¨ ´{ a ver si   funciona
+     { VK_OEM_3   ,NOCAPS, 'ç', 'Ç', '}' },  // Tecla ç Ç } a ver si funciona
+     { VK_acentos ,NOCAPS, 'º', 'ª', '\\' }, // Tecla º ª \ a ver si   funciona
+     { VK_OEM_MINUS, NOCAPS, 0x0027, '?' }, // Tecla ' ? a ver si funciona, no creo, debo definir ' de alguna otra manera
+     { VK_OEM_PLUS, NOCAPS, '¡', '¿' }, // Tecla ¡ ¿ a ver si funciona
+     { 0,0 }
+   };
+
+   ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = {
+     /* Normal, Shifted, Ctrl, C-S-x */
+     /* Legacy Ascii generators */
+     { 0, 0 }
+   };
+   ROSDATA VK_TO_WCHARS1 keypad_numbers[] = {
+     { VK_NUMPAD0, 0, '0' },
+     { VK_NUMPAD1, 0, '1' },
+     { VK_NUMPAD2, 0, '2' },
+     { VK_NUMPAD3, 0, '3' },
+     { VK_NUMPAD4, 0, '4' },
+     { VK_NUMPAD5, 0, '5' },
+     { VK_NUMPAD6, 0, '6' },
+     { VK_NUMPAD7, 0, '7' },
+     { VK_NUMPAD8, 0, '8' },
+     { VK_NUMPAD9, 0, '9' },
+     { VK_DECIMAL, 0, '.' },
+     { VK_BACK,    0, '\010' },
+     { 0,0 }
+   };
+
+   #define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) }
+   ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = {
+     vk_master(1,keypad_numbers),
+     vk_master(2,key_to_chars_2mod),
+     vk_master(3,key_to_chars_3mod),
+     vk_master(4,key_to_chars_4mod),
+     { 0,0,0 }
+   };
+
+   ROSDATA VSC_LPWSTR key_names[] = {
+     { 0x00, L"" },
+     { 0x01, L"Esc" },
+     { 0x0e, L"Backspace" },
+     { 0x0f, L"Tab" },
+     { 0x1c, L"Enter" },
+     { 0x1d, L"Ctrl" },
+     { 0x2a, L"Shift" },
+     { 0x36, L"Right Shift" },
+     { 0x37, L"Num *" },
+     { 0x38, L"Alt" },
+     { 0x39, L"Space" },
+     { 0x3a, L"Caps Lock" },
+     { 0x3b, L"F1" },
+     { 0x3c, L"F2" },
+     { 0x3d, L"F3" },
+     { 0x3e, L"F4" },
+     { 0x3f, L"F5" },
+     { 0x40, L"F6" },
+     { 0x41, L"F7" },
+     { 0x42, L"F8" },
+     { 0x43, L"F9" },
+     { 0x44, L"F10" },
+     { 0x45, L"Pause" },
+     { 0x46, L"Scroll Lock" },
+     { 0x47, L"Num 7" },
+     { 0x48, L"Num 8" },
+     { 0x49, L"Num 9" },
+     { 0x4a, L"Num -" },
+     { 0x4b, L"Num 4" },
+     { 0x4c, L"Num 5" },
+     { 0x4d, L"Num 6" },
+     { 0x4e, L"Num +" },
+     { 0x4f, L"Num 1" },
+     { 0x50, L"Num 2" },
+     { 0x51, L"Num 3" },
+     { 0x52, L"Num 0" },
+     { 0x53, L"Num Del" },
+     { 0x54, L"Sys Req" },
+     { 0x57, L"F11" },
+     { 0x58, L"F12" },
+     { 0x7c, L"F13" },
+     { 0x7d, L"F14" },
+     { 0x7e, L"F15" },
+     { 0x7f, L"F16" },
+     { 0x80, L"F17" },
+     { 0x81, L"F18" },
+     { 0x82, L"F19" },
+     { 0x83, L"F20" },
+     { 0x84, L"F21" },
+     { 0x85, L"F22" },
+     { 0x86, L"F23" },
+     { 0x87, L"F24" },
+     { 0, NULL },
+   };
+   ROSDATA VSC_LPWSTR extended_key_names[] = {
+     { 0x1c, L"Num Enter" },
+     { 0x1d, L"Right Ctrl" },
+     { 0x35, L"Num /" },
+     { 0x37, L"Prnt Scrn" },
+     { 0x38, L"Right Alt" },
+     { 0x45, L"Num Lock" },
+     { 0x46, L"Break" },
+     { 0x47, L"Home" },
+     { 0x48, L"Up" },
+     { 0x49, L"Page Up" },
+     { 0x4a, L"Left" },
+     { 0x4c, L"Center" },
+     { 0x4d, L"Right" },
+     { 0x4f, L"End" },
+     { 0x50, L"Down" },
+     { 0x51, L"Page Down" },
+     { 0x52, L"Insert" },
+     { 0x53, L"Delete" },
+     { 0x54, L"<ReactOS>" },
+     { 0x55, L"Help" },
+     { 0x56, L"Left Windows" },
+     { 0x5b, L"Right Windows" },
+     { 0, NULL },
+   };
+
+   /* Finally, the master table */
+   ROSDATA KBDTABLES keyboard_layout_table = {
+     /* modifier assignments */
+     (PMODIFIERS)&modifier_bits,
+     /* character from vk tables */
+     vk_to_wchar_master_table,
+
+     /* diacritical marks -- currently implemented by wine code */
+     /* English doesn't have any, anyway */
+     NULL,
+     /* Key names */
+     (VSC_LPWSTR *)key_names,
+     (VSC_LPWSTR *)extended_key_names,
+     NULL, /* Dead key names */
+
+     /* scan code to virtual key maps */
+     scancode_to_vk,
+     sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]),
+     extcode0_to_vk,
+     extcode1_to_vk,
+     MAKELONG(0,1), /* Version 1.0 */
+
+     /* Ligatures -- Spanish doesn't have any  */
+     0,
+     0,
+     NULL
+   };
+   PKBDTABLES STDCALL KbdLayerDescriptor() {
+     return &keyboard_layout_table;
+   }
diff --git a/reactos/lib/kbdes/kbdes.def b/reactos/lib/kbdes/kbdes.def
new file mode 100644
index 00000000000..27d0cf710c0
--- /dev/null
+++ b/reactos/lib/kbdes/kbdes.def
@@ -0,0 +1,3 @@
+LIBRARY kbdda.dll
+EXPORTS
+KbdLayerDescriptor@0
diff --git a/reactos/lib/kbdes/kbdes.rc b/reactos/lib/kbdes/kbdes.rc
new file mode 100644
index 00000000000..04db5518ee1
--- /dev/null
+++ b/reactos/lib/kbdes/kbdes.rc
@@ -0,0 +1,5 @@
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Spanish Keyboard Layout\0"
+#define REACTOS_STR_INTERNAL_NAME	"kbdes\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"kbdes.dll\0"
+#include <reactos/version.rc>