diff --git a/sys-devel/gettext/gettext-0.18.1.1.recipe b/sys-devel/gettext/gettext-0.18.1.1.recipe
index d8ce493aa..3559826aa 100644
--- a/sys-devel/gettext/gettext-0.18.1.1.recipe
+++ b/sys-devel/gettext/gettext-0.18.1.1.recipe
@@ -5,71 +5,75 @@ LICENSE="GNU GPL v3"
 COPYRIGHT="1998, 2010 Free Software Foundation, Inc."
 SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz"
 CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89"
-REVISION="4"
-ARCHITECTURES="x86_gcc2 ?x86"
+REVISION="5"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="gettext-0.18.1.1.patch"
 
 PROVIDES="
-	gettext = $portVersion compat >= 0.18.1
-	cmd:autopoint = $portVersion compat >= 0
-	cmd:envsubst = $portVersion compat >= 0
-	cmd:gettext = $portVersion compat >= 0
-	cmd:gettext.sh = $portVersion compat >= 0
-	cmd:gettextize = $portVersion compat >= 0
-	cmd:msgattrib = $portVersion compat >= 0
-	cmd:msgcat = $portVersion compat >= 0
-	cmd:msgcmp = $portVersion compat >= 0
-	cmd:msgcomm = $portVersion compat >= 0
-	cmd:msgconv = $portVersion compat >= 0
-	cmd:msgen = $portVersion compat >= 0
-	cmd:msgexec = $portVersion compat >= 0
-	cmd:msgfilter = $portVersion compat >= 0
-	cmd:msgfmt = $portVersion compat >= 0
-	cmd:msggrep = $portVersion compat >= 0
-	cmd:msginit = $portVersion compat >= 0
-	cmd:msgmerge = $portVersion compat >= 0
-	cmd:msgunfmt = $portVersion compat >= 0
-	cmd:msguniq = $portVersion compat >= 0
-	cmd:ngettext = $portVersion compat >= 0
-	cmd:recode_sr_latin = $portVersion compat >= 0
-	cmd:xgettext = $portVersion compat >= 0
-	devel:libasprintf = 0.0.0 compat >= 0
-	devel:libgettextlib = $portVersion
-	devel:libgettextlib_0.18.1 = $portVersion
-	devel:libgettextpo = 0.5.1 compat >= 0
-	devel:libgettextsrc = $portVersion
-	devel:libgettextsrc_0.18.1 = $portVersion
-	devel:libintl = 8.1.1 compat >= 8
-	lib:libasprintf = 0.0.0 compat >= 0
-	lib:libgettextlib_0.18.1 = $portVersion
-	lib:libgettextpo = 0.5.1 compat >= 0
-	lib:libgettextsrc_0.18.1 = $portVersion
+	gettext$secondaryArchSuffix = $portVersion compat >= 0.18.1
+	devel:libasprintf$secondaryArchSuffix = 0.0.0 compat >= 0
+	devel:libgettextlib$secondaryArchSuffix = $portVersion
+	devel:libgettextlib_0.18.1$secondaryArchSuffix = $portVersion
+	devel:libgettextpo$secondaryArchSuffix = 0.5.1 compat >= 0
+	devel:libgettextsrc$secondaryArchSuffix = $portVersion
+	devel:libgettextsrc_0.18.1$secondaryArchSuffix = $portVersion
+	devel:libintl$secondaryArchSuffix = 8.1.1 compat >= 8
+	lib:libasprintf$secondaryArchSuffix = 0.0.0 compat >= 0
+	lib:libgettextlib_0.18.1$secondaryArchSuffix = $portVersion
+	lib:libgettextpo = 0.5.1$secondaryArchSuffix compat >= 0
+	lib:libgettextsrc_0.18.1$secondaryArchSuffix = $portVersion
 	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:autopoint = $portVersion compat >= 0
+		cmd:envsubst = $portVersion compat >= 0
+		cmd:gettext = $portVersion compat >= 0
+		cmd:gettext.sh = $portVersion compat >= 0
+		cmd:gettextize = $portVersion compat >= 0
+		cmd:msgattrib = $portVersion compat >= 0
+		cmd:msgcat = $portVersion compat >= 0
+		cmd:msgcmp = $portVersion compat >= 0
+		cmd:msgcomm = $portVersion compat >= 0
+		cmd:msgconv = $portVersion compat >= 0
+		cmd:msgen = $portVersion compat >= 0
+		cmd:msgexec = $portVersion compat >= 0
+		cmd:msgfilter = $portVersion compat >= 0
+		cmd:msgfmt = $portVersion compat >= 0
+		cmd:msggrep = $portVersion compat >= 0
+		cmd:msginit = $portVersion compat >= 0
+		cmd:msgmerge = $portVersion compat >= 0
+		cmd:msgunfmt = $portVersion compat >= 0
+		cmd:msguniq = $portVersion compat >= 0
+		cmd:ngettext = $portVersion compat >= 0
+		cmd:recode_sr_latin = $portVersion compat >= 0
+		cmd:xgettext = $portVersion compat >= 0
+		"
+fi
+
 REQUIRES="
-	haiku >= $haikuVersion
-	gettext_libintl == $portVersion base
-	lib:libiconv
-	lib:libncurses
+	haiku$secondaryArchSuffix >= $haikuVersion
+	gettext${secondaryArchSuffix}_libintl == $portVersion base
+	lib:libiconv$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	devel:libiconv
-	devel:libncurses
+	devel:libiconv$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
 	cmd:makeinfo
 	"
 
-SOURCE_DIR="$portVersionedName"
-
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -104,10 +108,10 @@ TEST()
 
 SUMMARY_libintl="The gettext internationalization library"
 PROVIDES_libintl="
-	gettext_libintl = $portVersion compat >= 0.18.1
-	lib:libintl = 8.1.1 compat >= 8
+	gettext${secondaryArchSuffix}_libintl = $portVersion compat >= 0.18.1
+	lib:libintl${secondaryArchSuffix} = 8.1.1 compat >= 8
 	"
 REQUIRES_libintl="
-	haiku >= $haikuVersion
-	lib:libiconv
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	lib:libiconv${secondaryArchSuffix}
 	"