diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 8881af5..5606b1e 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -38,6 +38,9 @@ In chronological order:
   * Convert SCSS to plain CSS
   * Refresh style, make it responsive
 
+* Baptiste Darthenay
+  * Esperanto 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 fcbac1c..9870df4 100644
--- a/docs/docs/configuration/client.rst
+++ b/docs/docs/configuration/client.rst
@@ -50,7 +50,7 @@ data-isso-lang
 --------------
 
 Override useragent's preferred language. Currently available: german (de),
-english (en), french (fr), italian (it) and russian (ru).
+english (en), french (fr), italian (it), esperanto (eo) and russian (ru).
 
 data-isso-reply-to-self
 -----------------------
diff --git a/isso/js/app/i18n.js b/isso/js/app/i18n.js
index 7b12980..b6caa93 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"], function(config, de, en, fr, ru, it) {
+define(["app/config", "app/i18n/de", "app/i18n/en", "app/i18n/fr", "app/i18n/ru", "app/i18n/it", "app/i18n/eo"], function(config, de, en, fr, ru, it, eo) {
 
     "use strict";
 
@@ -7,6 +7,7 @@ define(["app/config", "app/i18n/de", "app/i18n/en", "app/i18n/fr", "app/i18n/ru"
         case "en":
         case "de":
         case "it":
+        case "eo":
             return function(msgs, n) {
                 return msgs[n === 1 ? 0 : 1];
             };
@@ -42,7 +43,8 @@ define(["app/config", "app/i18n/de", "app/i18n/en", "app/i18n/fr", "app/i18n/ru"
         en: en,
         fr: fr,
         ru: ru,
-        it: it
+        it: it,
+        eo: eo
     };
 
     var plural = pluralforms(lang);
diff --git a/isso/js/app/i18n/eo.js b/isso/js/app/i18n/eo.js
new file mode 100644
index 0000000..76150f3
--- /dev/null
+++ b/isso/js/app/i18n/eo.js
@@ -0,0 +1,27 @@
+define({
+    "postbox-text": "Tajpu komenton ĉi-tie (almenaŭ 3 signoj)",
+    "postbox-author": "Nomo (malnepra)",
+    "postbox-email": "Retadreso (malnepra)",
+    "postbox-website": "Retejo (malnepra)",
+    "postbox-submit": "Sendu",
+    "num-comments": "{{ n }} komento\n{{ n }} komentoj",
+    "no-comments": "Neniu komento ankoraŭ",
+    "comment-reply": "Respondu",
+    "comment-edit": "Redaktu",
+    "comment-save": "Savu",
+    "comment-delete": "Forviŝu",
+    "comment-confirm": "Konfirmu",
+    "comment-close": "Fermu",
+    "comment-cancel": "Malfaru",
+    "comment-deleted": "Komento forviŝita",
+    "comment-queued": "Komento en atendovico por kontrolo.",
+    "comment-anonymous": "Sennoma",
+    "comment-hidden": "{{ n }} kaŝitaj",
+    "date-now": "ĵus nun",
+    "date-minute": "antaŭ unu minuto\nantaŭ {{ n }} minutoj",
+    "date-hour": "antaŭ unu horo\nantaŭ {{ n }} horoj",
+    "date-day": "hieraŭ\nantaŭ {{ n }} tagoj",
+    "date-week": "lasta semajno\nantaŭ {{ n }} semajnoj",
+    "date-month": "lasta monato\nantaŭ {{ n }} monatoj",
+    "date-year": "lasta jaro\nantaŭ {{ n }} jaroj"
+});