diff --git a/docs/man/man1/ansible-playbook.1 b/docs/man/man1/ansible-playbook.1
index 9ae30ea6c2a..aa56d361797 100644
--- a/docs/man/man1/ansible-playbook.1
+++ b/docs/man/man1/ansible-playbook.1
@@ -2,12 +2,12 @@
 .\"     Title: ansible-playbook
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/19/2012
+.\"      Date: 11/03/2012
 .\"    Manual: System administration commands
 .\"    Source: Ansible 0.9
 .\"  Language: English
 .\"
-.TH "ANSIBLE\-PLAYBOOK" "1" "10/19/2012" "Ansible 0\&.9" "System administration commands"
+.TH "ANSIBLE\-PLAYBOOK" "1" "11/03/2012" "Ansible 0\&.9" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -126,9 +126,9 @@ ANSIBLE_LIBRARY \(em Override the default ansible module library path
 .sp
 /usr/share/ansible/ \(em Default module library
 .sp
-/etc/ansible/ansible\&.conf \(em Config file, used if present
+/etc/ansible/ansible\&.cfg \(em Config file, used if present
 .sp
-~/\&.ansible\&.config \(em User config file, overrides the default config if present
+~/\&.ansible\&.cfg \(em User config file, overrides the default config if present
 .SH "AUTHOR"
 .sp
 Ansible was originally written by Michael DeHaan\&. See the AUTHORS file for a complete list of contributors\&.
diff --git a/docs/man/man1/ansible.1 b/docs/man/man1/ansible.1
index 95f0ba3ab18..e12f8730b8a 100644
--- a/docs/man/man1/ansible.1
+++ b/docs/man/man1/ansible.1
@@ -2,12 +2,12 @@
 .\"     Title: ansible
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/19/2012
+.\"      Date: 11/03/2012
 .\"    Manual: System administration commands
 .\"    Source: Ansible 0.9
 .\"  Language: English
 .\"
-.TH "ANSIBLE" "1" "10/19/2012" "Ansible 0\&.9" "System administration commands"
+.TH "ANSIBLE" "1" "11/03/2012" "Ansible 0\&.9" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -167,9 +167,9 @@ Ranges of hosts are also supported\&. For more information and additional option
 .sp
 /usr/share/ansible/ \(em Default module library
 .sp
-/etc/ansible/ansible\&.conf \(em Config file, used if present
+/etc/ansible/ansible\&.cfg \(em Config file, used if present
 .sp
-~/\&.ansible\&.config \(em User config file, overrides the default config if present
+~/\&.ansible\&.cfg \(em User config file, overrides the default config if present
 .SH "ENVIRONMENT"
 .sp
 The following environment variables may specified\&.
@@ -177,6 +177,8 @@ The following environment variables may specified\&.
 ANSIBLE_HOSTS  \(em Override the default ansible hosts file
 .sp
 ANSIBLE_LIBRARY \(em Override the default ansible module library path
+.sp
+ANSIBLE_CONFIG \(em Override the default ansible config file
 .SH "AUTHOR"
 .sp
 Ansible was originally written by Michael DeHaan\&. See the AUTHORS file for a complete list of contributors\&.
diff --git a/hacking/templates/man.j2 b/hacking/templates/man.j2
index bde78cb280c..a040b416c9f 100644
--- a/hacking/templates/man.j2
+++ b/hacking/templates/man.j2
@@ -13,7 +13,8 @@
 ."
 {% if options %}
 .SH OPTIONS
-{% for (k,v) in options.iteritems()  %}
+{% for k in option_keys %}
+   {% set v = options[k] %}
 
 .IP @{ k }@
 {% for desc in v.description %}@{ desc | jpfunc }@{% endfor %}