diff --git a/sys-devel/automake/automake-1.11.1.bep b/sys-devel/automake/automake-1.11.1.bep
index 1fa3fa6ea..7919f2f15 100644
--- a/sys-devel/automake/automake-1.11.1.bep
+++ b/sys-devel/automake/automake-1.11.1.bep
@@ -1,31 +1,39 @@
-DESCRIPTION="automake - Used to generate Makefile.in from Makefile.am" 
-HOMEPAGE="http://www.gnu.org/software/automake/" 
+SUMMARY="A tool for generating 'Makefile.in' from 'Makefile.am'"
+DESCRIPTION="Automake is a tool for automatically generating 'Makefile.in' files
+	from 'Makefile.am' files.  'Makefile.am' is a series of 'make' macro
+	definitions (with rules occasionally thrown in).  The generated
+	'Makefile.in' files are compatible with the GNU Makefile standards."
+HOMEPAGE="http://www.gnu.org/software/automake/"
 SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.gz"
 CHECKSUM_MD5="4ee7f0ff5f0e467d58b6bd5da96b1c74"
-REVISION="1"
+REVISION="2"
 STATUS_HAIKU="stable"
-DEPEND=""
+
+PROVIDES="cmd:automake = $portVersion compat >= 1.11
+	cmd:automake-1.11 = $portVersion compat >= 1.11
+	cmd:aclocal = $portVersion compat >= 1.11
+	cmd:aclocal-1.11 = $portVersion compat >= 1.11"
+DEPEND="haiku >= $haikuVersion
+	awk
+	coreutils
+	diffutils
+	m4 >= 1.4
+	perl >= 5
+	sh"
+BUILD_DEPEND="haiku-devel >= $haikuVersion"
+
+SOURCE_DIR="$portVersionedName"
+
 BUILD {
-	cd automake-1.11.1
-	prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/automake-1.11.1
-	PERL="/bin/env perl" ./configure --prefix=$prefix \
-		--datarootdir=$prefix/data \
-		--sbindir=$prefix/bin \
-		--includedir=$prefix/develop/headers \
-		--sysconfdir=$prefix/settings \
-		--docdir=$prefix/documentation/packages/automake \
-		--infodir=$prefix/documentation/info \
-		--mandir=$prefix/documentation/man
-	make
+	PERL="/bin/env perl" ./configure $configureDirArgs
+	make -j$jobs
 }
 
 INSTALL {
-	cd automake-1.11.1
 	make install
 }
 
 TEST {
-	cd automake-1.11.1
 	make check
 }