diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe
index b418af8bd..17d071f0f 100644
--- a/sys-devel/autoconf/autoconf-2.69.recipe
+++ b/sys-devel/autoconf/autoconf-2.69.recipe
@@ -1,31 +1,47 @@
-SUMMARY="A GNU tool for automatically configuring source code"
-DESCRIPTION="GNU Autoconf is a tool for configuring source code and makefiles. Using
+SUMMARY="A tool for automatically configuring source code"
+DESCRIPTION="
+	GNU Autoconf is a tool for configuring source code and makefiles. Using
 	autoconf, programmers can create portable and configurable packages,
 	because the person building the package is allowed to specify various
-	configuration options."
+	configuration options.
+	"
 HOMEPAGE="http://www.gnu.org/software/autoconf/" 
+COPYRIGHT="1992-2012 Free Software Foundation, Inc."
+LICENSE="
+	GNU GPL v2
+	GNU GPL v3
+	"
 SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz"
 CHECKSUM_MD5="50f97f4159805e374639a73e2636f22e"
-REVISION="2"
-ARCHITECTURES="?x86_gcc2 ?x86"
+REVISION="3"
+ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="autoconf = $portVersion compat >= 2.60
+PROVIDES="
+	autoconf = $portVersion compat >= 2.60
 	cmd:autoconf = $portVersion compat >= 2.60
 	cmd:autoheader = $portVersion compat >= 2.60
 	cmd:autom4te = $portVersion compat >= 2.60
 	cmd:autoreconf = $portVersion compat >= 2.60
 	cmd:autoscan = $portVersion compat >= 2.60
 	cmd:autoupdate = $portVersion compat >= 2.60
-	cmd:ifnames = $portVersion compat >= 2.60"
-REQUIRES="haiku >= $haikuVersion
+	cmd:ifnames = $portVersion compat >= 2.60
+	"
+REQUIRES="
+	haiku >= $haikuVersion
 	cmd:awk
 	coreutils
 	diffutils
 	cmd:m4 >= 1.4
 	cmd:perl >= 5
-	cmd:sh"
-BUILD_REQUIRES="cmd:automake >= 1.13.1"
-BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
+	cmd:sh
+	"
+BUILD_REQUIRES="
+	cmd:automake >= 1.13.1
+	cmd:makeinfo
+	cmd:sed
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
 	cmd:autoreconf >= 2.60
 	cmd:make"
 
@@ -43,13 +59,10 @@ BUILD()
 INSTALL()
 {
 	make install
+	make install-html
 }
 
 TEST()
 {
 	make check
 }
-
-LICENSE="GNU GPL v2
-	GNU GPL v3"
-COPYRIGHT="1992-2012 Free Software Foundation, Inc."
diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe
index eb4ff4580..f1172793e 100644
--- a/sys-devel/automake/automake-1.13.1.recipe
+++ b/sys-devel/automake/automake-1.13.1.recipe
@@ -1,31 +1,44 @@
 SUMMARY="A tool for generating 'Makefile.in' from 'Makefile.am'"
-DESCRIPTION="Automake is a tool for automatically generating 'Makefile.in' files
+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."
+	'Makefile.in' files are compatible with the GNU Makefile standards.
+	"
 HOMEPAGE="http://www.gnu.org/software/automake/"
+COPYRIGHT="2013 Free Software Foundation, Inc."
+LICENSE="GNU GPL v2"
 SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz"
 CHECKSUM_MD5="78a0ef8216b0556b44508e7b5b0c0847"
-REVISION="2"
-ARCHITECTURES="?x86_gcc2 ?x86"
+REVISION="3"
+ARCHITECTURES="x86_gcc2 ?x86"
 
-PROVIDES="automake = $portVersion compat >= 1.11
-	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"
-REQUIRES="haiku >= $haikuVersion
+PROVIDES="
+	automake = $portVersion compat >= 1.13
+	cmd:automake = $portVersion compat >= 1.13
+	cmd:automake_1.13 = $portVersion compat >= 1.13
+	cmd:aclocal = $portVersion compat >= 1.13
+	cmd:aclocal_1.13 = $portVersion compat >= 1.13
+	"
+REQUIRES="
+	haiku >= $haikuVersion
 	cmd:awk
 	coreutils
 	diffutils
 	cmd:m4 >= 1.4
-	cmd:perl >= 5
-	cmd:sh"
-BUILD_REQUIRES="cmd:sed"
-BUILD_PREREQUIRES="haiku_devel >= $haikuVersion
+	cmd:perl >= 5.8
+	cmd:sh
+	"
+BUILD_REQUIRES="
+	cmd:perl >= 5.8
+	cmd:makeinfo
+	cmd:sed
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
     cmd:autoconf >= 2.60
     cmd:make
-    cmd:perl >= 5.8"
+    "
 
 SOURCE_DIR="$portVersionedName"
 
@@ -38,6 +51,7 @@ BUILD()
 INSTALL()
 {
 	make install
+	make install-html
 }
 
 TEST()
@@ -45,5 +59,3 @@ TEST()
 	make check
 }
 
-LICENSE="GNU GPL v2"
-COPYRIGHT="2013 Free Software Foundation, Inc."