diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index c4eb019fffa7..a4f88e5538e8 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -13,27 +13,16 @@ MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	The Automated Program Generator
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	guile.21:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
 
-USES=		shebangfix
+USES=		gmake pathfix shebangfix
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack libxml2
-USE_GMAKE=	yes
+USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libguile=yes --with-libxml2=yes --datadir=${PREFIX}/share
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	autoopts/tpl/*.pl
 
-MAN1=	autogen.1 autoopts-config.1 columns.1 getdefs.1 xml2ag.1
-MAN3=	ao_string_tokenize.3 configFileLoad.3 optionFileLoad.3 \
-	optionFindNextValue.3 optionFindValue.3 optionFree.3 \
-	optionGetValue.3 optionLoadLine.3 optionNextValue.3 \
-	optionProcess.3 optionRestore.3 optionOnlyUsage.3 \
-	optionSaveFile.3 optionSaveState.3 optionUnloadNested.3 \
-	optionVersion.3 strequate.3 streqvcmp.3 streqvmap.3 strneqvcmp.3 \
-	strtransform.3
-
 INFO=	autogen
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/autogen/pkg-plist b/devel/autogen/pkg-plist
index 8cf126efa902..d8f15588f69d 100644
--- a/devel/autogen/pkg-plist
+++ b/devel/autogen/pkg-plist
@@ -53,5 +53,31 @@ share/aclocal/autoopts.m4
 %%DATADIR%%/texi2texi
 %%DATADIR%%/tpl-config.tlib
 %%DATADIR%%/usage.tlib
+man/man1/autogen.1.gz
+man/man1/autoopts-config.1.gz
+man/man1/columns.1.gz
+man/man1/getdefs.1.gz
+man/man1/xml2ag.1.gz
+man/man3/ao_string_tokenize.3.gz
+man/man3/configFileLoad.3.gz
+man/man3/optionFileLoad.3.gz
+man/man3/optionFindNextValue.3.gz
+man/man3/optionFindValue.3.gz
+man/man3/optionFree.3.gz
+man/man3/optionGetValue.3.gz
+man/man3/optionLoadLine.3.gz
+man/man3/optionNextValue.3.gz
+man/man3/optionOnlyUsage.3.gz
+man/man3/optionProcess.3.gz
+man/man3/optionRestore.3.gz
+man/man3/optionSaveFile.3.gz
+man/man3/optionSaveState.3.gz
+man/man3/optionUnloadNested.3.gz
+man/man3/optionVersion.3.gz
+man/man3/strequate.3.gz
+man/man3/streqvcmp.3.gz
+man/man3/streqvmap.3.gz
+man/man3/strneqvcmp.3.gz
+man/man3/strtransform.3.gz
 @dirrm %%DATADIR%%
 @dirrm include/autoopts