diff --git a/AUTHORS.md b/AUTHORS.md
index 6c826c51f..18b96ef1a 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -11,4 +11,5 @@ Zbigniew Czernik
 Jonas H盲ggqvist
 Sabas
 Paul Spencer
-Rapha雔 Pinson
\ No newline at end of file
+Rapha雔 Pinson
+Juan Luis Rodr韌uez Ponce
\ No newline at end of file
diff --git a/WebContent/OSRM.config.js b/WebContent/OSRM.config.js
index 7c817671b..fe30e41e1 100644
--- a/WebContent/OSRM.config.js
+++ b/WebContent/OSRM.config.js
@@ -46,6 +46,7 @@ OSRM.DEFAULTS = {
 		{encoding:"en", name:"English"},
 		{encoding:"de", name:"Deutsch"},
 		{encoding:"dk", name:"Dansk"},
+		{encoding:"es", name:"Espa帽ol"},
 		{encoding:"fi", name:"Suomi"},
 		{encoding:"fr", name:"Fran莽ais"},
 		{encoding:"it", name:"Italiano"},
diff --git a/WebContent/localization/OSRM.Locale.dk.js b/WebContent/localization/OSRM.Locale.dk.js
index 869c8cad7..e59bb27d4 100644
--- a/WebContent/localization/OSRM.Locale.dk.js
+++ b/WebContent/localization/OSRM.Locale.dk.js
@@ -103,4 +103,4 @@ OSRM.Localization["dk"] = {
 
 //set GUI language on load
 if( OSRM.DEFAULTS.LANUGAGE_ONDEMAND_RELOADING == true )
-	OSRM.Localization.setLanguage("dk");
\ No newline at end of file
+	OSRM.Localization.setLanguage("dk");
diff --git a/WebContent/localization/OSRM.Locale.es.js b/WebContent/localization/OSRM.Locale.es.js
new file mode 100644
index 000000000..4312e79c9
--- /dev/null
+++ b/WebContent/localization/OSRM.Locale.es.js
@@ -0,0 +1,106 @@
+/*
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+*/
+
+// OSRM localization
+// [Spanish language support]
+
+
+OSRM.Localization["es"] = {
+// own language
+"LANGUAGE": "Espa帽ol",
+// gui
+"GUI_START": "Inicio",
+"GUI_END": "Destino",
+"GUI_RESET": "Borrar",
+"GUI_ZOOM": "Zoom en la Ruta",
+"GUI_SEARCH": "Mostrar",
+"GUI_REVERSE": "Invertir",
+"GUI_START_TOOLTIP": "Escriba la direcci贸n de origen",
+"GUI_END_TOOLTIP": "Escriba la direcci贸n de destino",
+"GUI_LEGAL_NOTICE": "GUI2 v"+OSRM.VERSION+" "+OSRM.DATE+" - OSRM alojado en <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder gracias a <a href='http://www.osm.org/'>OSM</a>",
+// config
+"GUI_CONFIGURATION": "Configuraci贸n",
+"GUI_LANGUAGE": "Idioma",
+"GUI_UNITS": "Unidades",
+"GUI_KILOMETERS": "Kilometros",
+"GUI_MILES": "Millas",
+"GUI_DATA_TIMESTAMP": "datos",
+// mapping
+"GUI_MAPPING_TOOLS": "Herramientas del mapa",
+"GUI_HIGHLIGHT_UNNAMED_ROADS": "Resaltar calles sin nombre",
+"GUI_SHOW_PREVIOUS_ROUTES": "Mostrar rutas anteriores",
+"OPEN_JOSM": "JOSM",
+"OPEN_OSMBUGS": "OSM Bugs",
+// geocoder
+"SEARCH_RESULTS": "Resultados de la b煤squeda",
+"FOUND_X_RESULTS": "%i resultado(s)",
+"TIMED_OUT": "Se super贸 el tiempo m谩ximo de espera",
+"NO_RESULTS_FOUND": "No se han encontrado resultados",
+"NO_RESULTS_FOUND_SOURCE": "Ning煤n resultado para el inicio",
+"NO_RESULTS_FOUND_TARGET": "Ning煤n resultado para el destino",
+// routing
+"ROUTE_DESCRIPTION": "Descripci贸n de la ruta",
+"GET_LINK_TO_ROUTE": "Generar enlace",
+"GENERATE_LINK_TO_ROUTE": "esperando el enlace",
+"LINK_TO_ROUTE_TIMEOUT": "no disponible",
+"GPX_FILE": "Archivo GPX",
+"DISTANCE": "Distancia",
+"DURATION": "Duraci贸n",
+"YOUR_ROUTE_IS_BEING_COMPUTED": "Estamos calculando su ruta",
+"NO_ROUTE_FOUND": "No hay ninguna ruta posible",
+// printing
+"OVERVIEW_MAP": "Mapa de referencia",
+"NO_ROUTE_SELECTED": "Ninguna ruta seleccionada",
+// directions
+"N": "norte",
+"E": "este",
+"S": "sur",
+"W": "oeste",
+"NE": "noreste",
+"SE": "sureste",
+"SW": "suroeste",
+"NW": "noroeste",
+// driving directions
+// %s: road name
+// %d: direction
+// [*]: will only be printed when there actually is a road name
+"DIRECTION_0":"Instrucci贸n desconocida[ en <b>%s</b>]",
+"DIRECTION_1":"Contin煤e[ por <b>%s</b>]",
+"DIRECTION_2":"Gire ligeramente a la derecha[ hacia <b>%s</b>]",
+"DIRECTION_3":"Gire a la derecha [ hacia <b>%s</b>]",
+"DIRECTION_4":"Gire pronunciadamente a la derecha[ hacia <b>%s</b>]",
+"DIRECTION_5":"Realice un cambio de sentido[ en <b>%s</b>]",
+"DIRECTION_6":"Gire pronunciadamente a la izquierda[ hacia <b>%s</b>]",
+"DIRECTION_7":"Gire a la izquierda [ hacia <b>%s</b>]",
+"DIRECTION_8":"Gire ligeramente a la izquierda[ hacia <b>%s</b>]",
+"DIRECTION_10":"Dir铆jase hacia el <b>%d</b>[ por <b>%s</b>]",
+"DIRECTION_11-1":"En la rotonda, tome la primera salida[ en direcci贸n <b>%s</b>]",
+"DIRECTION_11-2":"En la rotonda, tome la segunda salida[ en direcci贸n <b>%s</b>]",
+"DIRECTION_11-3":"En la rotonda, tome la tercera salida[ en direcci贸n <b>%s</b>]",
+"DIRECTION_11-4":"En la rotonda, tome la cuarta salida[ en direcci贸n <b>%s</b>]",
+"DIRECTION_11-5":"En la rotonda, tome la quinta salida[ en direcci贸n <b>%s</b>]",
+"DIRECTION_11-6":"En la rotonda, tome la sexta salida[ en direcci贸n <b>%s</b>]",
+"DIRECTION_11-7":"En la rotonda, tome la s茅ptima salida[ en direcci贸n <b>%s</b>]",
+"DIRECTION_11-8":"En la rotonda, tome la octava salida[ en direcci贸n <b>%s</b>]",
+"DIRECTION_11-9":"En la rotonda, tome la novena salida[ en direcci贸n <b>%s</b>]",
+"DIRECTION_11-x":"En la rotonda, tome una de sus muchas salidas [ en direcci贸n <b>%s</b>]",
+"DIRECTION_15":"Ha llegado a su destino"
+};
+
+// set GUI language on load
+if( OSRM.DEFAULTS.LANUGAGE_ONDEMAND_RELOADING == true )
+	OSRM.Localization.setLanguage("es");
diff --git a/WebContent/localization/OSRM.Locale.fi.js b/WebContent/localization/OSRM.Locale.fi.js
index b1da9c2ce..9afc59288 100644
--- a/WebContent/localization/OSRM.Locale.fi.js
+++ b/WebContent/localization/OSRM.Locale.fi.js
@@ -103,4 +103,4 @@ OSRM.Localization["fi"] = {
 
 //set GUI language tielle load
 if( OSRM.DEFAULTS.LANUGAGE_ONDEMAND_RELOADING == true )
-	OSRM.Localization.setLanguage("fi");
\ No newline at end of file
+	OSRM.Localization.setLanguage("fi");