diff --git a/dev-db/sqlite/sqlite-3.7.5.recipe b/dev-db/sqlite/sqlite-3.7.5.recipe
index ba99e8c15..bdf72b3a0 100644
--- a/dev-db/sqlite/sqlite-3.7.5.recipe
+++ b/dev-db/sqlite/sqlite-3.7.5.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://www.sqlite.org/"
 SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz"
 CHECKSUM_MD5="a9604a82613ade2e7f4c303f233e477f"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="sqlite = $portVersion compat >= 3.7
 	cmd:sqlite3 = $portVersion compat >= 3.7
diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe
index a1eb8bb6c..5cdc0cd60 100644
--- a/dev-lang/perl/perl-5.10.1.recipe
+++ b/dev-lang/perl/perl-5.10.1.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="Larry Wall's Practical Extraction and Report Language."
 HOMEPAGE="http://www.perl.org/"
 SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 PROVIDES="perl = $portVersion compat >= 5
 	cmd:perl = $portVersion compat >= 5
 	lib:libperl = $portVersion compat >= 5"
diff --git a/dev-libs/apr-util/apr-util-1.3.10.recipe b/dev-libs/apr-util/apr-util-1.3.10.recipe
index 1ee3e329a..9067c8950 100644
--- a/dev-libs/apr-util/apr-util-1.3.10.recipe
+++ b/dev-libs/apr-util/apr-util-1.3.10.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://apr.apache.org/"
 SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz"
 CHECKSUM_MD5="82acd25cf3df8c72eba44eaee8b80c19"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="apr-util = $portVersion compat >= 1
 	lib:libaprutil = $portVersion compat >= 1
diff --git a/dev-libs/apr/apr-1.4.2.recipe b/dev-libs/apr/apr-1.4.2.recipe
index 6032068bc..1cc5fff37 100644
--- a/dev-libs/apr/apr-1.4.2.recipe
+++ b/dev-libs/apr/apr-1.4.2.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://apr.apache.org/"
 SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.2.tar.gz"
 CHECKSUM_MD5="fc80cb54f158c2674f9eeb47a1f672cd"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="apr = $portVersion compat >= 1
 	lib:libapr = $portVersion compat >= 1
diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe
index a73cccda6..ab622f8a9 100644
--- a/dev-libs/expat/expat-2.0.1.recipe
+++ b/dev-libs/expat/expat-2.0.1.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://expat.sourceforge.net/"
 SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz"
 CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="expat = $portVersion compat >= 2.0
 	lib:libexpat = $portVersion compat >= 1.5"
diff --git a/dev-libs/libiconv/libiconv-1.13.1.recipe b/dev-libs/libiconv/libiconv-1.13.1.recipe
index af0719110..09dd10de8 100644
--- a/dev-libs/libiconv/libiconv-1.13.1.recipe
+++ b/dev-libs/libiconv/libiconv-1.13.1.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://www.gnu.org/software/libiconv/"
 SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz"
 CHECKSUM_MD5="7ab33ebd26687c744a37264a330bbe9a"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="iconv = $portVersion compat >= 1.13
 	cmd:iconv = 2.5.0 compat >= 2
diff --git a/dev-libs/libxml2/libxml2-2.7.8.recipe b/dev-libs/libxml2/libxml2-2.7.8.recipe
index 6b771096e..8d956ecee 100644
--- a/dev-libs/libxml2/libxml2-2.7.8.recipe
+++ b/dev-libs/libxml2/libxml2-2.7.8.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz"
 CHECKSUM_MD5="8127a65e8c3b08856093099b52599c86"
 REVISION="2"
-STATUS_HAIKU="broken"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="libxml2 = $portVersion compat >= 2.7
 	lib:libxml2 = $portVersion compat >= 2.7"
diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe
index 128323468..d86f61bcd 100644
--- a/dev-libs/openssl/openssl-1.0.0d.recipe
+++ b/dev-libs/openssl/openssl-1.0.0d.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://www.openssl.org/"
 SRC_URI="http://www.openssl.org/source/openssl-1.0.0d.tar.gz"
 CHECKSUM_MD5="40b6ea380cc8a5bf9734c2f8bf7e701e"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="openssl = $portVersion compat >= 1
 	cmd:c_rehash = $portVersion compat >= 1
diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe
index 172b2c168..ee3b4f102 100644
--- a/dev-vcs/cvs/cvs-1.12.13.1.recipe
+++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://www.nongnu.org/cvs/"
 SRC_URI="ftp://ftp.ru.debian.org/gentoo-distfiles/distfiles/cvs-1.12.13.1.tar.bz2"
 CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="cvs = $portVersion compat >= 1.12
 	cmd:cvs = $portVersion compat >= 1.12"
diff --git a/dev-vcs/subversion/subversion-1.6.15.recipe b/dev-vcs/subversion/subversion-1.6.15.recipe
index 08127c925..047556d58 100644
--- a/dev-vcs/subversion/subversion-1.6.15.recipe
+++ b/dev-vcs/subversion/subversion-1.6.15.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://subversion.apache.org"
 SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.15.tar.bz2"
 CHECKSUM_MD5="113fca1d9e4aa389d7dc2b210010fa69"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="subversion = $portVersion compat >= 1.6
 	cmd:svn = $portVersion compat >= 1.6
diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe
index a51d30e38..8aa8370c9 100644
--- a/net-misc/neon/neon-0.29.6.recipe
+++ b/net-misc/neon/neon-0.29.6.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://www.webdav.org/neon/"
 SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz"
 CHECKSUM_MD5="591e0c82e6979e7e615211b386b8f6bc"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="neon = $portVersion compat >= 0.29
 	lib:libneon = 27.2.6 compat >= 27.2"
diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe
index b6dba1cc4..c0dcd5d92 100644
--- a/sys-apps/texinfo/texinfo-4.13a.recipe
+++ b/sys-apps/texinfo/texinfo-4.13a.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://www.gnu.org/software/texinfo/"
 SRC_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz"
 CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="texinfo = $portVersion compat >= 4.13
 	cmd:info = $portVersion compat >= 4.13
diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe
index 7ea79bb71..0faa897e0 100644
--- a/sys-devel/autoconf/autoconf-2.68.recipe
+++ b/sys-devel/autoconf/autoconf-2.68.recipe
@@ -7,7 +7,7 @@ HOMEPAGE="http://www.gnu.org/software/autoconf/"
 SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.bz2"
 CHECKSUM_MD5="864d785215aa60d627c91fcb21b05b07"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="autoconf = $portVersion compat >= 2.68
 	cmd:autoconf = $portVersion compat >= 2.68
diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe
index 6afc2948f..21358f476 100644
--- a/sys-devel/automake/automake-1.11.1.recipe
+++ b/sys-devel/automake/automake-1.11.1.recipe
@@ -7,7 +7,7 @@ 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="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="automake = $portVersion compat >= 1.11
 	cmd:automake = $portVersion compat >= 1.11
diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe
index 92392ee5f..b08590afd 100644
--- a/sys-devel/bison/bison-2.4.3.recipe
+++ b/sys-devel/bison/bison-2.4.3.recipe
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnu.org/software/bison/bison.html"
 SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz"
 CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="bison = $portVersion compat >= 2.4
 	cmd:bison = $portVersion compat >= 2.4
diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe
index 89e5022d2..043051895 100644
--- a/sys-devel/flex/flex-2.5.35.recipe
+++ b/sys-devel/flex/flex-2.5.35.recipe
@@ -5,7 +5,7 @@ HOMEPAGE="http://flex.sourceforge.net/"
 SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download"
 CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="flex = $portVersion compat >= 2.5
 	cmd:flex = $portVersion compat >= 2.5
diff --git a/sys-devel/gcc/gcc-2.95.3_110711.recipe b/sys-devel/gcc/gcc-2.95.3_110711.recipe
index 0c0f6aa31..0826530d5 100644
--- a/sys-devel/gcc/gcc-2.95.3_110711.recipe
+++ b/sys-devel/gcc/gcc-2.95.3_110711.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://gcc.gnu.org"
 # TODO: Also: http://www.gnu.org/software/binutils
 SRC_URI="git+git://github.com/weinhold/buildtools.git#ba94fdf309096bd9bbf432ad53efba62bc47f98e"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="gcc = $portVersion compat >= 2.95.3
 	cmd:cpp = $portVersion compat >= 2.95.3
diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe
index a6e0a3c3d..947d62452 100644
--- a/sys-devel/libtool/libtool-2.4.recipe
+++ b/sys-devel/libtool/libtool-2.4.recipe
@@ -5,7 +5,7 @@ HOMEPAGE="http://www.gnu.org/software/libtool"
 SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz"
 CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="libtool = $portVersion compat >= 2.4
 	cmd:libtool = $portVersion compat >= 2.4
diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe
index 83f900e7f..7c5ada088 100644
--- a/sys-devel/m4/m4-1.4.16.recipe
+++ b/sys-devel/m4/m4-1.4.16.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://www.gnu.org/software/m4/"
 SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz"
 CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280"
 REVISION="2"
-STATUS_HAIKU="stable"
+ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="m4 = $portVersion compat >= 1.4
 	cmd:m4 = $portVersion compat >= 1.4"
diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe
index fa0f3634a..689f493a5 100644
--- a/sys-devel/make/make-3.82.recipe
+++ b/sys-devel/make/make-3.82.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://www.gnu.org/software/make/"
 SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2"
 CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f"
 REVISION="2"
-STATUS_HAIKU="broken"
+ARCHITECTURES="x86_gcc2 ?x86"
 	# make-3.82 has problems/incompatibilities when doing 'make install DESTDIR'
 	# on other packages (e.g. perl)