diff --git a/modoboa/core/commands/templates/settings.py.tpl b/modoboa/core/commands/templates/settings.py.tpl
index f661f2b71..6354777e1 100644
--- a/modoboa/core/commands/templates/settings.py.tpl
+++ b/modoboa/core/commands/templates/settings.py.tpl
@@ -67,6 +67,7 @@ INSTALLED_APPS += MODOBOA_APPS
 AUTH_USER_MODEL = 'core.User'
 
 MIDDLEWARE_CLASSES = (
+    'x_forwarded_for.middleware.XForwardedForMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
diff --git a/requirements.txt b/requirements.txt
index 48bb52ba4..8acc68d56 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,3 +7,4 @@ factory-boy>=2.4
 passlib
 django-versionfield2>=0.3.3
 requests
+django-xforwardedfor-middleware