diff --git a/net-misc/curl/curl-7.26.0.recipe b/net-misc/curl/curl-7.26.0.recipe
index ab0c00531..147f2a52c 100644
--- a/net-misc/curl/curl-7.26.0.recipe
+++ b/net-misc/curl/curl-7.26.0.recipe
@@ -4,37 +4,41 @@ COPYRIGHT="1996-2012, Daniel Stenberg, <daniel@haxx.se>. All rights reserved."
 LICENSE="Curl"
 SRC_URI="http://curl.haxx.se/download/curl-7.26.0.tar.bz2"
 CHECKSUM_MD5="bfa80f01b3d300359cfb4d409b6136a3"
-REVISION="4"
-ARCHITECTURES="x86_gcc2 ?x86"
+REVISION="5"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="curl-7.26.0.patch"
 
 PROVIDES="
-	curl = $portVersion
-	cmd:curl = $portVersion compat >= 7.16
-	lib:libcurl = 4.2.0 compat >= 4
+	curl$secondaryArchSuffix = $portVersion
+	lib:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4
 	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:curl = $portVersion compat >= 7.16
+		"
+fi
+
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	ca_root_certificates
-	lib:libssl
-	lib:libz
+	lib:libssl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	devel:libssl
-	devel:libz
+	devel:libssl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:autoconf
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
-
 BUILD()
 {
 	certsInstallDir="$portPackageLinksDir/ca_root_certificates"
@@ -76,6 +80,12 @@ INSTALL()
 		$binDir/curl-config \
 		$developDir \
 		$manDir/man3
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
 }
 
 TEST()
@@ -96,10 +106,10 @@ DESCRIPTION="
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	curl_devel = $portVersion
-	cmd:curl_config = $portVersion compat >= 7.16
-	devel:libcurl = 4.2.0 compat >= 4
+	curl${secondaryArchSuffix}_devel = $portVersion
+	cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16
+	devel:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4
 	"
 REQUIRES_devel="
-	curl == $portVersion base
+	curl$secondaryArchSuffix == $portVersion base
 	"