diff --git a/Makefile b/Makefile
index 596dcc5d1a..e43718646d 100644
--- a/Makefile
+++ b/Makefile
@@ -161,4 +161,4 @@ deb: debian
 # for arch or gentoo, read instructions in the appropriate 'packaging' subdirectory directory
 
 manpages:
-	hacking/module_formatter.py -t man -o docs/man/man1/ --module-dir=library --template-dir=hacking/templates
+	hacking/module_formatter.py -A $(VERSION) -t man -o docs/man/man1/ --module-dir=library --template-dir=hacking/templates
diff --git a/hacking/templates/man.j2 b/hacking/templates/man.j2
index 47a960285c..7ec644f26e 100644
--- a/hacking/templates/man.j2
+++ b/hacking/templates/man.j2
@@ -11,7 +11,7 @@
 ." ------ OPTIONS
 ."
 ."
-{% if options is defined -%}
+{% if options -%}
 .SH OPTIONS
 {% for (k,v) in options.iteritems()  %}
 .IP @{ k }@