diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index 4df7694527..68f6073646 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -20,7 +20,7 @@
 # - Jose Ramon Garcia
 # - Robert Menes
 # - Chelo Sacristán
-# - Francisco Vila, 2008
+# - Francisco Vila, 2009
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -810,7 +810,7 @@
 </phrase>
 <phrase>
   id: LANG_VERSION
-  desc: in the info menu
+  desc: in the Rockbox Info screen
   user: core
   <source>
     *: "Version"
@@ -10231,7 +10231,6 @@
   </dest>
   <voice>
     *: "Fin de la lista de canciones"
-    player: "Fin de la lista"
   </voice>
 </phrase>
 <phrase>
@@ -12172,3 +12171,178 @@
     quickscreen: ""
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE_19200
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "19200"
+  </source>
+  <dest>
+    *: none
+    serial_port: "19200"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "19200"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ENABLE_SPEAKER
+  desc: in Settings -> Sound Settings
+  user: core
+  <source>
+    *: none
+    speaker: "Enable Speaker"
+  </source>
+  <dest>
+    *: none
+    speaker: "Activar altavoz"
+  </dest>
+  <voice>
+    *: none
+    speaker: "Activar altavoz"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SORT_INTERPRET_NUMBERS
+  desc: in Settings -> File view
+  user: core
+  <source>
+    *: "Interpret numbers when sorting"
+  </source>
+  <dest>
+    *: "Interpretar números al ordenar"
+  </dest>
+  <voice>
+    *: "Interpretar números al ordenar"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "Serial Bitrate"
+  </source>
+  <dest>
+    *: none
+    serial_port: "Bitrate del puerto serie"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "Bit rate del puerto serie"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE_9600
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "9600"
+  </source>
+  <dest>
+    *: none
+    serial_port: "9600"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "9600"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE_38400
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "38400"
+  </source>
+  <dest>
+    *: none
+    serial_port: "38400"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "38400"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE_57600
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "57600"
+  </source>
+  <dest>
+    *: none
+    serial_port: "57600"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "57600"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SORT_INTERPRET_AS_NUMBERS
+  desc: in Settings -> File view
+  user: core
+  <source>
+    *: "As whole numbers"
+  </source>
+  <dest>
+    *: "Como números completos"
+  </dest>
+  <voice>
+    *: "Como números completos"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CREDITS
+  desc: in the Main Menu -> System screen
+  user: core
+  <source>
+    *: "Credits"
+  </source>
+  <dest>
+    *: "Créditos"
+  </dest>
+  <voice>
+    *: "Créditos"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SORT_INTERPRET_AS_DIGIT
+  desc: in Settings -> File view
+  user: core
+  <source>
+    *: "As digits"
+  </source>
+  <dest>
+    *: "Como dígitos"
+  </dest>
+  <voice>
+    *: "Como dígitos"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SERIAL_BITRATE_AUTO
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    serial_port: "Auto"
+  </source>
+  <dest>
+    *: none
+    serial_port: "Automático"
+  </dest>
+  <voice>
+    *: none
+    serial_port: "Automático"
+  </voice>
+</phrase>
diff --git a/docs/MAINTAINERS b/docs/MAINTAINERS
index 27a07f7830..4928bb5a85 100644
--- a/docs/MAINTAINERS
+++ b/docs/MAINTAINERS
@@ -139,6 +139,7 @@ the person(s) named next to "General".
 :Français: Mustapha Senhaji
 :Hebrew: Tomer Shalev
 :Tagalog: Melba Sitjar
+:Español: Francisco Vila
 
 
 Plugins