diff --git a/ChangeLog b/ChangeLog
index 4fcf224..b8f0b29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-05  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* doc/Makefile.am:
+	* morituri.spec.in:
+	* morituri/extern/Makefile.am:
+	  Use help2man.py to generate manpage.
+
 2010-04-04  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/common/encode.py:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0bee3e3..bce5e37 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,7 +20,10 @@ morituri.rss2: $(top_srcdir)/morituri.doap
 morituri.ics: $(top_srcdir)/morituri.doap
 	-moap doap -f $(top_srcdir)/morituri.doap ical > morituri.ics
 
-# man_MANS = man/rip.1
+man_MANS = man/rip.1
+
+man/rip.1: $(top_srcdir)/morituri/extern/command/help2man.py $(top_srcdir)/morituri
+	PYTHONPATH=$(top_srcdir) python $(top_srcdir)/morituri/extern/command/help2man.py morituri.rip.main.Rip rip > man/rip.1
 
 clean-local:
 	@rm -rf reference
diff --git a/morituri.spec.in b/morituri.spec.in
index 5782ec0..1561cb7 100644
--- a/morituri.spec.in
+++ b/morituri.spec.in
@@ -44,7 +44,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc README morituri.doap NEWS RELEASE ChangeLog
 %{_bindir}/rip
-#%{_mandir}/man1/rip.1*
+%{_mandir}/man1/rip.1*
 %{python_sitelib}/morituri
 %{_sysconfdir}/bash_completion.d/rip
 
diff --git a/morituri/extern/Makefile.am b/morituri/extern/Makefile.am
index 3a4debc..4a3d72e 100644
--- a/morituri/extern/Makefile.am
+++ b/morituri/extern/Makefile.am
@@ -18,4 +18,4 @@ command_PYTHON = \
 	command/__init__.py \
 	command/command.py
 
-EXTRA_DIST = log/test_log.py command/test_command.py
+EXTRA_DIST = log/test_log.py command/test_command.py command/help2man.py