diff --git a/docs/conf.py b/docs/conf.py
index d1b30fec4..4063488d2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -13,6 +13,9 @@
 
 import sys, os
 
+sys.path.append('..')
+from packstack import version as packstackversion
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -48,9 +51,9 @@ copyright = u'2012, Red Hat'
 # built documents.
 #
 # The short X.Y version.
-version = '2012.2.2.1pre'
+version = packstackversion.version_string()
 # The full version, including alpha/beta/rc tags.
-release = '2012.2.2.1pre'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/packstack.rst b/docs/packstack.rst
index 79dd049d9..ad337b5bb 100644
--- a/docs/packstack.rst
+++ b/docs/packstack.rst
@@ -127,11 +127,6 @@ Server Prepare Configs
 
 **CONFIG_USE_EPEL**            : Install openstack from epel, If set to "n" this causes EPEL to be permanently disabled before installing openstack, i.e. you should have alternative openstack repositories in place ['y', 'n']
 
-Puppet Config paramaters
-------------------------
-
-**CONFIG_PUPPET_REMOVEMODULES** : Causes the Puppet modules to be removed (if present), and recloned from git (NOTE : may clone a untested version) ['y', 'n']
-
 
 SOURCE
 ======
diff --git a/spec/packstack.spec b/spec/packstack.spec
index df5cb075a..da97b043e 100644
--- a/spec/packstack.spec
+++ b/spec/packstack.spec
@@ -1,5 +1,5 @@
 
-%global git_revno 186
+%global git_revno 188
 
 Name:           openstack-packstack
 Version:        2012.2.1
@@ -14,8 +14,10 @@ Source0:        https://github.com/downloads/fedora-openstack/packstack/packstac
 
 BuildArch:      noarch
 
+BuildRequires:  make
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
+BuildRequires:  python-sphinx
 
 Requires:       openssh-clients
 
@@ -41,14 +43,21 @@ mv packstack/puppet %{_builddir}/puppet
 
 %{__python} setup.py build
 
+cd docs
+make man
+
 %install
 %{__python} setup.py install --skip-build --root %{buildroot}
 mv %{_builddir}/puppet %{buildroot}/%{python_sitelib}/packstack/puppet
 
+mkdir -p %{buildroot}%{_mandir}/man1
+install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
+
 %files
 %{_bindir}/packstack
 %{python_sitelib}/packstack
 %{python_sitelib}/packstack-%{version}*.egg-info
+%{_mandir}/man1/packstack.1.gz
 
 %changelog