diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 5606b1e..9b2d6a9 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -41,6 +41,8 @@ In chronological order:
 * Baptiste Darthenay
   * Esperanto translation
 
+* Matías Ducasa <https://github.com/matiasducasa>
+  * Spanish translation
+  
 * [Your name or handle] <[email or website]>
   * [Brief summary of your changes]
-
diff --git a/docs/docs/configuration/client.rst b/docs/docs/configuration/client.rst
index 9f465db..254f572 100644
--- a/docs/docs/configuration/client.rst
+++ b/docs/docs/configuration/client.rst
@@ -51,7 +51,7 @@ data-isso-lang
 --------------
 
 Override useragent's preferred language. Currently available: german (de),
-english (en), french (fr), italian (it), esperanto (eo) and russian (ru).
+english (en), french (fr), italian (it), esperanto (eo), russian (ru) and spanish (es).
 
 data-isso-reply-to-self
 -----------------------
diff --git a/isso/js/app/i18n.js b/isso/js/app/i18n.js
index 04e800e..96c1cdd 100644
--- a/isso/js/app/i18n.js
+++ b/isso/js/app/i18n.js
@@ -1,4 +1,4 @@
-define(["app/config", "app/i18n/de", "app/i18n/en", "app/i18n/fr", "app/i18n/ru", "app/i18n/it", "app/i18n/eo", "app/i18n/sv", "app/i18n/nl", "app/i18n/el_GR"], function(config, de, en, fr, ru, it, eo, sv, nl, el) {
+define(["app/config", "app/i18n/de", "app/i18n/en", "app/i18n/fr", "app/i18n/ru", "app/i18n/it", "app/i18n/eo", "app/i18n/sv", "app/i18n/nl", "app/i18n/el_GR", "app/i18n/es"], function(config, de, en, fr, ru, it, eo, sv, nl, el, es) {
 
     "use strict";
 
@@ -7,6 +7,7 @@ define(["app/config", "app/i18n/de", "app/i18n/en", "app/i18n/fr", "app/i18n/ru"
         case "de":
         case "el":
         case "en":
+        case "es":
         case "eo":
         case "it":
         case "sv":
@@ -50,7 +51,8 @@ define(["app/config", "app/i18n/de", "app/i18n/en", "app/i18n/fr", "app/i18n/ru"
         it: it,
         ru: ru,
         sv: sv,
-        nl: nl
+        nl: nl,
+        es: es
     };
 
     var plural = pluralforms(lang);
diff --git a/isso/js/app/i18n/es.js b/isso/js/app/i18n/es.js
new file mode 100644
index 0000000..a1bfc47
--- /dev/null
+++ b/isso/js/app/i18n/es.js
@@ -0,0 +1,30 @@
+define({
+    "postbox-text": "Escriba su comentario aquí (al menos 3 caracteres)",
+    "postbox-author": "Nombre (opcional)",
+    "postbox-email": "E-mail (opcional)",
+    "postbox-website": "Sitio web (opcional)",
+    "postbox-submit": "Enviar",
+
+    "num-comments": "Un Comentario\n{{ n }} Comentarios",
+    "no-comments": "Sin Comentarios Todavía",
+
+    "comment-reply": "Responder",
+    "comment-edit": "Editar",
+    "comment-save": "Guardar",
+    "comment-delete": "Eliminar",
+    "comment-confirm": "Confirmar",
+    "comment-close": "Cerrar",
+    "comment-cancel": "Cancelar",
+    "comment-deleted": "Comentario eliminado.",
+    "comment-queued": "Comentario en espera para moderación.",
+    "comment-anonymous": "Anónimo",
+    "comment-hidden": "{{ n }} Oculto(s)",
+
+    "date-now": "ahora",
+    "date-minute": "hace un minuto\nhace {{ n }} minutos",
+    "date-hour": "hace una hora\nhace {{ n }} horas",
+    "date-day": "ayer\nHace {{ n }} días",
+    "date-week": "la semana pasada\nhace {{ n }} semanas",
+    "date-month": "el mes pasado\nhace {{ n }} meses",
+    "date-year": "el año pasado\nhace {{ n }} años"
+});