diff --git a/django/conf/locale/eo/__init__.py b/django/conf/locale/eo/__init__.py
new file mode 100755
index 0000000000..e69de29bb2
diff --git a/django/conf/locale/eo/formats.py b/django/conf/locale/eo/formats.py
new file mode 100755
index 0000000000..5f0e3a09a0
--- /dev/null
+++ b/django/conf/locale/eo/formats.py
@@ -0,0 +1,52 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+from __future__ import unicode_literals
+
+# The *_FORMAT strings use the Django date format syntax,
+# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+DATE_FORMAT = r'j\-\a \d\e F Y'         # '26-a de julio 1887'
+TIME_FORMAT = 'H:i:s'                   # '18:59:00'
+DATETIME_FORMAT = r'j\-\a \d\e F Y\, \j\e H:i:s'  # '26-a de julio 1887, je 18:59:00'
+YEAR_MONTH_FORMAT = r'F \d\e Y'         # 'julio de 1887'
+MONTH_DAY_FORMAT = r'j\-\a \d\e F'      # '26-a de julio'
+SHORT_DATE_FORMAT = 'Y-m-d'             # '1887-07-26'
+SHORT_DATETIME_FORMAT = 'Y-m-d H:i:s'   # '1887-07-26 18:59:00'
+FIRST_DAY_OF_WEEK = 1  # Monday (lundo)
+
+# The *_INPUT_FORMATS strings use the Python strftime format syntax,
+# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+DATE_INPUT_FORMATS = (
+    '%Y-%m-%d',                         # '1887-07-26'
+    '%y-%m-%d',                         # '87-07-26'
+    '%Y %m %d',                         # '1887 07 26'
+    '%d-a de %b %Y',                    # '26-a de jul 1887'
+    '%d %b %Y',                         # '26 jul 1887'
+    '%d-a de %B %Y',                    # '26-a de julio 1887'
+    '%d %B %Y',                         # '26 julio 1887'
+    '%d %m %Y',                         # '26 07 1887'
+)
+TIME_INPUT_FORMATS = (
+    '%H:%M:%S',                         # '18:59:00'
+    '%H:%M',                            # '18:59'
+)
+DATETIME_INPUT_FORMATS = (
+    '%Y-%m-%d %H:%M:%S',                # '1887-07-26 18:59:00'
+    '%Y-%m-%d %H:%M',                   # '1887-07-26 18:59'
+    '%Y-%m-%d',                         # '1887-07-26'
+
+    '%Y.%m.%d %H:%M:%S',                # '1887.07.26 18:59:00'
+    '%Y.%m.%d %H:%M',                   # '1887.07.26 18:59'
+    '%Y.%m.%d',                         # '1887.07.26'
+
+    '%d/%m/%Y %H:%M:%S',                # '26/07/1887 18:59:00'
+    '%d/%m/%Y %H:%M',                   # '26/07/1887 18:59'
+    '%d/%m/%Y',                         # '26/07/1887'
+
+    '%y-%m-%d %H:%M:%S',                # '87-07-26 18:59:00'
+    '%y-%m-%d %H:%M',                   # '87-07-26 18:59'
+    '%y-%m-%d',                         # '87-07-26'
+)
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = '\xa0'  # non-breaking space
+NUMBER_GROUPING = 3
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index b2be67d390..adce067eb0 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -545,6 +545,8 @@ Internationalization
   app or project message file. See :ref:`how-to-create-language-files` for
   details.
 
+* Added :ref:`format definitions <format-localization>` for Esperanto.
+
 Management Commands
 ^^^^^^^^^^^^^^^^^^^