diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2c8c813..bad81d8 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,5 +1,9 @@
 Changelog
 =========
 
+* :support:`-` improve production settings
+  - no custom cache and database
+  - get `ALLOWED_HOSTS` and `SERVER_EMAIL` from environment variables
+
 * :release:`0.1 <2014-05-31>`
 * :feature:`-` intial support for creating LDAP users and groups
diff --git a/docs/conf.py b/docs/conf.py
index 472a042..fda7743 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -20,6 +20,9 @@ import os
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath(os.path.join('..', 'gvaldap')))
 
+os.environ['GVALDAP_ALLOWED_HOSTS'] = 'localhost'
+os.environ['GVALDAP_SERVER_EMAIL'] = 'root@localhost'
+
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.