diff --git a/srcpkgs/autogen/template b/srcpkgs/autogen/template
index 6666742e780..c8f8587686e 100644
--- a/srcpkgs/autogen/template
+++ b/srcpkgs/autogen/template
@@ -1,21 +1,25 @@
 # Template build file for 'autogen'.
 pkgname=autogen
-version=5.17.4
-revision=2
+version=5.18.2
+revision=1
 build_style=gnu-configure
-hostmakedepends="pkg-config which guile"
+hostmakedepends="pkg-config which"
 makedepends="guile-devel libxml2-devel gc-devel"
 short_desc="The Automated Program Generator"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL3"
 homepage="http://autogen.sourceforge.net/"
 distfiles="${GNU_SITE}/${pkgname}/rel${version}/${pkgname}-${version}.tar.gz"
-checksum=cd2585f4794d0e9d7f2cb0b9af4f2bd429946e718473edf1cf8c49f081ca71ed
+checksum=cc2702dec21ba5b01144865163f6d1a54268d2b72aafc5520ad0e0cb57104068
+
+replaces="autogen-docs>=0"
 
 do_configure() {
 	GUILE_CFLAGS="$(pkg-config --cflags guile-2.0)"
 	GUILE_LDFLAGS="$(pkg-config --libs guile-2.0)"
-	./configure ${configure_args} --with-libguile-cflags="${GUILE_CFLAGS}" \
+
+	./configure ${configure_args} --with-libguile \
+		--with-libguile-cflags="${GUILE_CFLAGS}" \
 		--with-libguile-libs="${GUILE_LDFLAGS}"
 }
 
@@ -24,20 +28,13 @@ post_install() {
 }
 
 autogen-devel_package() {
-	short_desc+=" (Development files)"
+	short_desc+=" - development files"
 	depends="autogen"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/libopts.a
 		vmove usr/lib/pkgconfig
 		vmove usr/share/aclocal
-	}
-}
-
-autogen-docs_package() {
-	short_desc+=" (Documentation)"
-	pkg_install() {
-		vmove usr/share/info
-		vmove usr/share/man
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 	}
 }