diff --git a/autoconf/.md5sum b/autoconf/.md5sum
index 07817228..18ef7def 100644
--- a/autoconf/.md5sum
+++ b/autoconf/.md5sum
@@ -1 +1,2 @@
+69e7776af37ced9712bb43176b35436d  autoconf-2.60-mandir.patch
 019609c29d0cbd9110c38480304aafc8  autoconf-2.60.tar.bz2
diff --git a/autoconf/Pkgfile b/autoconf/Pkgfile
index 49b7396d..48faf81a 100644
--- a/autoconf/Pkgfile
+++ b/autoconf/Pkgfile
@@ -4,13 +4,15 @@
 
 name=autoconf
 version=2.60
-release=1
-source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2)
+release=2
+source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2 \
+	$name-$version-mandir.patch)
 
 build () {
-    cd $name-$version
-    ./configure --prefix=/usr --mandir=$PKG/usr/man
-    make
-    make prefix=$PKG/usr install
-    rm -rf $PKG/usr/share/info $PKG/usr/share/emacs
+	cd $name-$version
+	patch -i $SRC/$name-$version-mandir.patch lib/autoconf/general.m4
+	./configure --prefix=/usr --mandir=$PKG/usr/man
+	make
+	make prefix=$PKG/usr install
+	rm -rf $PKG/usr/share/info $PKG/usr/share/emacs
 }
diff --git a/autoconf/autoconf-2.60-mandir.patch b/autoconf/autoconf-2.60-mandir.patch
new file mode 100644
index 00000000..78e10bb8
--- /dev/null
+++ b/autoconf/autoconf-2.60-mandir.patch
@@ -0,0 +1,20 @@
+--- general.m4.orig	2006-07-07 09:13:11.000000000 -0500
++++ general.m4	2006-07-07 09:13:39.000000000 -0500
+@@ -570,7 +570,7 @@
+ AC_SUBST([psdir],          ['${docdir}'])dnl
+ AC_SUBST([libdir],         ['${exec_prefix}/lib'])dnl
+ AC_SUBST([localedir],      ['${datarootdir}/locale'])dnl
+-AC_SUBST([mandir],         ['${datarootdir}/man'])dnl
++AC_SUBST([mandir],         ['${prefix}/man'])dnl
+ 
+ ac_prev=
+ ac_dashdash=
+@@ -1005,7 +1005,7 @@
+   --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
+   --infodir=DIR          info documentation [DATAROOTDIR/info]
+   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
+-  --mandir=DIR           man documentation [DATAROOTDIR/man]
++  --mandir=DIR           man documentation [PREFIX/man]
+   --docdir=DIR           documentation root ]@<:@DATAROOTDIR/doc/m4_ifset([AC_PACKAGE_TARNAME], [AC_PACKAGE_TARNAME], [PACKAGE])@:>@[
+   --htmldir=DIR          html documentation [DOCDIR]
+   --dvidir=DIR           dvi documentation [DOCDIR]