diff --git a/dev-libs/gmp/gmp-5.1.1.recipe b/dev-libs/gmp/gmp-5.1.1.recipe
index 18b274937..5301d1a1e 100644
--- a/dev-libs/gmp/gmp-5.1.1.recipe
+++ b/dev-libs/gmp/gmp-5.1.1.recipe
@@ -1,7 +1,14 @@
 SUMMARY="GMP - GNU Multiple Precision Arithmetic Library" 
 DESCRIPTION="
-GMP - GNU Multiple Precision Arithmetic Library
-" 
+The GNU Multiple Precision Arithmetic Library (GMP) is a free library for \
+arbitrary-precision arithmetic, operating on signed integers, rational numbers, \
+and floating point numbers. There are no practical limits to the precision \
+except the ones implied by the available memory in the machine GMP runs on \
+(operand dimension limit is 2^(32)-1 bits on 32-bit machines and 2^37 bits on \
+64-bit machines). GMP has a rich set of functions, and the functions have a \
+regular interface. The basic interface is for C but wrappers exist for other \
+languages including Ada, C++, C#, OCaml, Perl, PHP, and Python. \
+"
 HOMEPAGE="http://gmplib.org/" 
 SRC_URI="ftp://ftp.gmplib.org/pub/gmp-5.1.1/gmp-5.1.1.tar.xz"
 CHECKSUM_MD5="485b1296e6287fa381e6015b19767989"
@@ -10,14 +17,18 @@ LICENSE="GNU GPL v3
 COPYRIGHT="1991-2013 Free Software Foundation, Inc."
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
-PROVIDES="cmd:gmp = $portVersion compat >= 5.1
-	lib:libgmp
-	lib:libgmp = 10
-	lib:libgmp = 10.1.1"
-REQUIRES="haiku >= $haikuVersion"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+PROVIDES="gmp$secondaryArchSuffix = $portVersion compat >= 5.1
+	lib:libgmp$secondaryArchSuffix = 10.1.1 compat >= 10
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
-	cmd:gcc
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
 	cmd:libtool
 	cmd:autoconf
 	cmd:automake
@@ -36,7 +47,7 @@ BUILD()
 
 INSTALL()
 {
-	make install
+	make install includedir=$includeDir includeexecdir=$includeDir
 	
 	# prepare devel/lib
 	prepareInstalledDevelLibs libgmp
@@ -54,10 +65,10 @@ TEST()
 # ----- devel package 
 
 PROVIDES_devel="
-	libgmp = $portVersion
-	devel:libgmp = 10.1.1 compat >= 0
+	gmp${secondaryArchSuffix}_devel = $portVersion
+	devel:libgmp$secondaryArchSuffix = 10.1.1 compat >= 0
 	"
 REQUIRES_devel="
-	libgmp == $portVersion base
+	gmp$secondaryArchSuffix == $portVersion base
 	"
 
diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe
index c30bc05fa..8f3c0f185 100644
--- a/sys-libs/readline/readline-6.2.recipe
+++ b/sys-libs/readline/readline-6.2.recipe
@@ -17,27 +17,28 @@ SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz"
 CHECKSUM_MD5="67948acb2ca081f23359d0256e9a271c"
 REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="readline-6.2.patch"
 
 PROVIDES="
-	readline = $portVersion compat >= 6
-	lib:libhistory = $portVersion compat >= 6
-	lib:libreadline = $portVersion compat >= 6
+	readline$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libhistory$secondaryArchSuffix = $portVersion compat >= 6
+	lib:libreadline$secondaryArchSuffix = $portVersion compat >= 6
 	"
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libncurses
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libncurses$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	devel:libncurses
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
 	"
@@ -70,10 +71,10 @@ INSTALL()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	readline_devel = $portVersion
-	devel:libhistory = $portVersion compat >= 6
-	devel:libreadline = $portVersion compat >= 6
+	readline${secondaryArchSuffix}_devel = $portVersion
+	devel:libhistory$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libreadline$secondaryArchSuffix = $portVersion compat >= 6
 	"
 REQUIRES_devel="
-	readline == $portVersion base
+	readline$secondaryArchSuffix == $portVersion base
 	"