diff --git a/README.rst b/README.rst
index 6a247c8..9acaebb 100644
--- a/README.rst
+++ b/README.rst
@@ -498,6 +498,22 @@
                   server_groups: 20
                   server_group_members: 20
 
+Extra config params in keystone.conf (since Mitaka release)
+
+.. code-block:: yaml
+
+    keystone:
+      server:
+        ....
+        extra_config:
+          ini_section1:
+            param1: value
+            param2: value
+          ini_section2:
+            param1: value
+            param2: value
+        ....
+
 Usage
 =====
 
diff --git a/keystone/files/mitaka/keystone.conf.Debian b/keystone/files/mitaka/keystone.conf.Debian
index d639719..608f38a 100644
--- a/keystone/files/mitaka/keystone.conf.Debian
+++ b/keystone/files/mitaka/keystone.conf.Debian
@@ -2192,3 +2192,12 @@
 
 [extra_headers]
 Distribution = Ubuntu
+
+{% if server.extra_config is defined %}
+{%- for section, params in server.extra_config.iteritems() %}
+[{{ section }}]
+{%- for param, value in params.iteritems() %}
+{{ param }} = {{ value }}
+{%- endfor %}
+{%- endfor %}
+{%- endif %}