diff --git a/textproc/dblatex/Makefile b/textproc/dblatex/Makefile
index f2d9495e4d7..bf5ccef6954 100644
--- a/textproc/dblatex/Makefile
+++ b/textproc/dblatex/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2010/08/30 21:47:15 jasper Exp $
+# $OpenBSD: Makefile,v 1.4 2010/09/24 18:50:34 jasper Exp $
 
 COMMENT =		convert DocBook to LaTeX, DVI, PostScript, and PDF
 DISTNAME =		dblatex-0.3
-REVISION=		1
+REVISION=		2
 CATEGORIES =		textproc
 
 # GPLv2+
@@ -32,7 +32,7 @@ NO_REGRESS =		Yes
 SUBST_VARS +=		LOCALBASE MODPY_BIN
 
 post-extract:
-	@perl -pi -e 's,share/man/man1,man/man1,' ${WRKSRC}/setup.py
+	@cd ${WRKSRC}/docs/manpage/ && gunzip dblatex.1.gz
 
 post-install:
 	@rm -r ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/contrib
diff --git a/textproc/dblatex/patches/patch-setup_py b/textproc/dblatex/patches/patch-setup_py
new file mode 100644
index 00000000000..ee0e59815c4
--- /dev/null
+++ b/textproc/dblatex/patches/patch-setup_py
@@ -0,0 +1,15 @@
+$OpenBSD: patch-setup_py,v 1.1 2010/09/24 18:50:34 jasper Exp $
+
+Install the unzipped manpage in the right place.
+
+--- setup.py.orig	Fri Sep 24 10:51:29 2010
++++ setup.py	Fri Sep 24 10:52:44 2010
+@@ -405,7 +405,7 @@ if __name__ == "__main__":
+         data_files=[('share/dblatex', ['xsl', 'latex']),
+                     ('share/doc/dblatex', pdfdocs),
+                     ('share/doc/dblatex', htmldoc),
+-                    ('share/man/man1', ['docs/manpage/dblatex.1.gz'])],
++                    ('man/man1', ['docs/manpage/dblatex.1'])],
+         scripts=['scripts/dblatex'],
+         cmdclass={'build_scripts': BuildScripts,
+                   'install': Install,
diff --git a/textproc/dblatex/pkg/PLIST b/textproc/dblatex/pkg/PLIST
index 977d4482dce..8812df7d6a3 100644
--- a/textproc/dblatex/pkg/PLIST
+++ b/textproc/dblatex/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2010/05/06 18:08:02 stsp Exp $
+@comment $OpenBSD: PLIST,v 1.2 2010/09/24 18:50:34 jasper Exp $
 bin/dblatex
 lib/python${MODPY_VERSION}/site-packages/dblatex-0.3-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/dbtexmf/
@@ -98,7 +98,7 @@ lib/python${MODPY_VERSION}/site-packages/dbtexmf/xslt/xslt.py
 lib/python${MODPY_VERSION}/site-packages/dbtexmf/xslt/xslt.pyc
 lib/python${MODPY_VERSION}/site-packages/dbtexmf/xslt/xsltproc.py
 lib/python${MODPY_VERSION}/site-packages/dbtexmf/xslt/xsltproc.pyc
-@man man/man1/dblatex.1.gz
+@man man/man1/dblatex.1
 share/dblatex/
 share/dblatex/latex/
 share/dblatex/latex/contrib/