diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe
index 4d467655a..7c23a3b0d 100644
--- a/dev-libs/libevent/libevent-2.0.21.recipe
+++ b/dev-libs/libevent/libevent-2.0.21.recipe
@@ -16,8 +16,13 @@ COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors."
 
 REVISION="7"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	libevent${secondaryArchSuffix} = ${portVersion}
diff --git a/net-misc/tor/tor-0.2.4.20.recipe b/net-misc/tor/tor-0.2.4.20.recipe
index c7626f4c3..44412c11e 100644
--- a/net-misc/tor/tor-0.2.4.20.recipe
+++ b/net-misc/tor/tor-0.2.4.20.recipe
@@ -1,6 +1,5 @@
 SUMMARY="A virtual layer that helps you improve privacy and anonymity"
-DESCRIPTION="
-Tor is a network of virtual tunnels that allows people and groups to improve \
+DESCRIPTION="Tor is a network of virtual tunnels that allows people and groups to improve \
 their privacy and security on the Internet. It also enables software \
 developers to create new communication tools with built-in privacy features. \
 Tor provides the foundation for a range of applications that allow \
@@ -33,23 +32,27 @@ government IP addresses in their web logs, and for security during sting \
 operations.
 The variety of people who use Tor is actually part of what makes it so secure. \
 Tor hides you among the other users on the network, so the more populous and \
-diverse the user base for Tor is, the more your anonymity will be protected.
-"
+diverse the user base for Tor is, the more your anonymity will be protected."
 HOMEPAGE="https://www.torproject.org"
 SRC_URI="https://archive.torproject.org/tor-package-archive/tor-0.2.4.20.tar.gz"
 CHECKSUM_SHA256="ccc51747cbcbf98f658c34d5c693ff8a868698da0349d056e98287ef2e294d9f"
 
 REVISION="1"
 
-ARCHITECTURES="x86_gcc2 x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	ARCHITECTURES="x86_gcc2 $ARCHITECTURES"
+else
+	ARCHITECTURES="!x86_gcc2 $ARCHITECTURES"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	tor = $portVersion
-	cmd:tor$secondaryArchSuffix
-	cmd:tor_gencert$secondaryArchSuffix
-	cmd:tor_resolve$secondaryArchSuffix
-	cmd:torify$secondaryArchSuffix
+	cmd:tor = $portVersion
+	cmd:tor_gencert = $portVersion
+	cmd:tor_resolve = $portVersion
+	cmd:torify = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -68,6 +71,7 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
+	cmd:awk
 	"
 	
 LICENSE="Tor"
@@ -77,13 +81,13 @@ COPYRIGHT="
 	2007-2013, The Tor Project, Inc.
 	"
 
-USER_SETTINGS_FILES="
-	settings/tor directory
-	"
+#USER_SETTINGS_FILES="
+#	settings/tor directory
+#	"
 	
-GLOBAL_WRITABLE_FILES="
-	settings/tor/torrc.sample auto-merge
-	"
+#GLOBAL_WRITABLE_FILES="
+#	settings/tor/torrc.sample auto-merge
+#	"
 
 BUILD()
 {