diff --git a/textproc/docbook2X/Makefile b/textproc/docbook2X/Makefile
index 5656ebaecfca..ffe512b1e909 100644
--- a/textproc/docbook2X/Makefile
+++ b/textproc/docbook2X/Makefile
@@ -24,26 +24,14 @@ CONFLICTS=	docbook-utils-*
 
 GNU_CONFIGURE=	yes
 USES=		iconv gmake perl5
+CONFIGURE_ENV=	PERL=${PERL}
 
-.if defined(NOPORTDOCS)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-doc__Makefile.in
-.endif
+OPTIONS_DEFINE=	DOCS
+
+INFO=		docbook2X docbook2man-xslt docbook2texi-xslt
 
-NO_STAGE=	yes
 post-patch:
-		@${REINPLACE_CMD} "s|\$${prefix}|${PREFIX}|" \
-			${WRKSRC}/configure
-
-MAN1=		db2x_manxml.1 \
-		db2x_texixml.1 \
-		db2x_xsltproc.1 \
-		docbook2man.1 \
-		docbook2texi.1 \
-		sgml2xml-isoent.1 \
-		utf8trans.1
-
-INFO=		docbook2X \
-		docbook2man-xslt \
-		docbook2texi-xslt
+	@${REINPLACE_CMD} "s|\$${prefix}|${PREFIX}|" \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/textproc/docbook2X/files/extra-patch-doc__Makefile.in b/textproc/docbook2X/files/extra-patch-doc__Makefile.in
deleted file mode 100644
index 1a074ed02e2c..000000000000
--- a/textproc/docbook2X/files/extra-patch-doc__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./doc/Makefile.in.orig	2009-04-22 22:42:38.000000000 -0400
-+++ ./doc/Makefile.in	2009-04-22 22:42:45.000000000 -0400
-@@ -563,7 +563,7 @@
- 
- info-am: $(INFO_DEPS)
- 
--install-data-am: install-htmlDATA install-info-am install-man
-+install-data-am: install-info-am install-man
- 
- install-exec-am:
- 
diff --git a/textproc/docbook2X/pkg-descr b/textproc/docbook2X/pkg-descr
index 5a12bb530078..ac262acf1152 100644
--- a/textproc/docbook2X/pkg-descr
+++ b/textproc/docbook2X/pkg-descr
@@ -5,4 +5,4 @@ It aims to support DocBook version 4.2, excepting the features that
 cannot be supported or are not useful in a man page or Texinfo
 document.
 
-WWW:    http://docbook2x.sourceforge.net/
+WWW: http://docbook2x.sourceforge.net/
diff --git a/textproc/docbook2X/pkg-plist b/textproc/docbook2X/pkg-plist
index b1a3438e8091..d5ed66c4f150 100644
--- a/textproc/docbook2X/pkg-plist
+++ b/textproc/docbook2X/pkg-plist
@@ -5,6 +5,13 @@ bin/docbook2man
 bin/docbook2texi
 bin/sgml2xml-isoent
 bin/utf8trans
+man/man1/db2x_manxml.1.gz
+man/man1/db2x_texixml.1.gz
+man/man1/db2x_xsltproc.1.gz
+man/man1/docbook2man.1.gz
+man/man1/docbook2texi.1.gz
+man/man1/sgml2xml-isoent.1.gz
+man/man1/utf8trans.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/changes.html
 %%PORTDOCS%%%%DOCSDIR%%/charsets.html
 %%PORTDOCS%%%%DOCSDIR%%/cindex.html
@@ -166,4 +173,4 @@ bin/utf8trans
 @dirrm %%DATADIR%%/dtd
 @dirrm %%DATADIR%%/charmaps
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%