diff --git a/Makefile.common b/Makefile.common
index 821f34e03f..19baecb39f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -343,6 +343,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
 			 menu/menu_hash.o \
 			 menu/intl/menu_hash_de.o \
 			 menu/intl/menu_hash_es.o \
+			 menu/intl/menu_hash_eo.o \
 			 menu/intl/menu_hash_fr.o \
 			 menu/intl/menu_hash_it.o \
 			 menu/intl/menu_hash_nl.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index e14506d623..394b692c05 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -755,6 +755,7 @@ MENU
 
 #include "../menu/intl/menu_hash_de.c"
 #include "../menu/intl/menu_hash_es.c"
+#include "../menu/intl/menu_hash_eo.c"
 #include "../menu/intl/menu_hash_fr.c"
 #include "../menu/intl/menu_hash_it.c"
 #include "../menu/intl/menu_hash_nl.c"
diff --git a/libretro.h b/libretro.h
index 591170ba4c..4b669358a7 100755
--- a/libretro.h
+++ b/libretro.h
@@ -242,6 +242,7 @@ enum retro_language
    RETRO_LANGUAGE_KOREAN              =  9,
    RETRO_LANGUAGE_CHINESE_TRADITIONAL = 10,
    RETRO_LANGUAGE_CHINESE_SIMPLIFIED  = 11,
+   RETRO_LANGUAGE_ESPERANTO           = 12,
    RETRO_LANGUAGE_LAST,
 
    /* Ensure sizeof(enum) == sizeof(int) */
diff --git a/menu/intl/menu_hash_eo.c b/menu/intl/menu_hash_eo.c
new file mode 100644
index 0000000000..1061b899fe
--- /dev/null
+++ b/menu/intl/menu_hash_eo.c
@@ -0,0 +1,42 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2015 - Daniel De Matteis
+ *
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch 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 General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <string.h>
+
+#include "../menu_hash.h"
+
+const char *menu_hash_to_str_eo(uint32_t hash)
+{
+   switch (hash)
+   {
+      default:
+         break;
+   }
+
+   return "null";
+}
+
+int menu_hash_get_help_eo(uint32_t hash, char *s, size_t len)
+{
+   switch (hash)
+   {
+      default:
+         return -1;
+   }
+
+   return 0;
+}
diff --git a/menu/menu_hash.c b/menu/menu_hash.c
index 7688012e13..4ab93c28b3 100644
--- a/menu/menu_hash.c
+++ b/menu/menu_hash.c
@@ -50,6 +50,8 @@ const char *menu_hash_to_str(uint32_t hash)
       case RETRO_LANGUAGE_DUTCH:
          ret = menu_hash_to_str_nl(hash);
          break;
+      case RETRO_LANGUAGE_ESPERANTO:
+         ret = menu_hash_to_str_eo(hash);
       default:
          break;
    }
@@ -88,6 +90,8 @@ int menu_hash_get_help(uint32_t hash, char *s, size_t len)
       case RETRO_LANGUAGE_DUTCH:
          ret = menu_hash_get_help_nl(hash, s, len);
          break;
+      case RETRO_LANGUAGE_ESPERANTO:
+         ret = menu_hash_get_help_eo(hash, s, len);
       default:
          break;
    }
diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index 8a7d71e956..a786056ddd 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -952,6 +952,9 @@ int menu_hash_get_help_nl(uint32_t hash, char *s, size_t len);
 const char *menu_hash_to_str_pt(uint32_t hash);
 int menu_hash_get_help_pt(uint32_t hash, char *s, size_t len);
 
+const char *menu_hash_to_str_eo(uint32_t hash);
+int menu_hash_get_help_eo(uint32_t hash, char *s, size_t len);
+
 const char *menu_hash_to_str_us(uint32_t hash);
 int menu_hash_get_help_us(uint32_t hash, char *s, size_t len);