diff --git a/dev-util/cppunit/cppunit-1.12.1.recipe b/dev-util/cppunit/cppunit-1.12.1.recipe
index ae45376b0..e370defd0 100644
--- a/dev-util/cppunit/cppunit-1.12.1.recipe
+++ b/dev-util/cppunit/cppunit-1.12.1.recipe
@@ -7,37 +7,44 @@ HOMEPAGE="http://cppunit.sourceforge.net/"
 SRC_URI="http://downloads.sourceforge.net/cppunit/cppunit-1.12.1.tar.gz"
 CHECKSUM_SHA256="ac28a04c8e6c9217d910b0ae7122832d28d9917fa668bcc9e0b8b09acb4ea44a"
 LICENSE="GNU LGPL v2.1"
-COPYRIGHT="
-	Michael Feathers <mfeathers@objectmentor.com>
-	Jerome Lacoste <lacostej@altern.org>
-	E. Sommerlade <eric@sommerla.de>
-	Baptiste Lepilleur <gaiacrtn@free.fr> <blep@sourceforge.net>
-	Bastiaan Bakker <bastiaan.bakker@lifeline.nl>
-	Steve Robbins <smr99@sourceforge.net>
-	"
-REVISION="1"
+COPYRIGHT="2000 Jerome Lacoste
+	2000 Michael Feathers
+	2000-2002 E. Sommerlade
+	2001-2013 Baptiste Lepilleur
+	2001 Bastiaan Bakker
+	2001-2002, 2007-2008  Steve Robbins
+	2012-2013 Harvey Brydon"
+REVISION="2"
 ARCHITECTURES="x86 x86_gcc2"
-
-SOURCE_DIR="$portName-$portVersion"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	cppunit = $portVersion compat >= 1.12
-	cmd:cppunit_config = $portVersion compat >= 1.12
-	cmd:DllPlugInTester = $portVersion compat >= 1.12
-	lib:libcppunit = $portVersion compat >= 1.12
-	lib:libcppunit_1.12 = $portVersion compat >= 1.12
+	cppunit$secondaryArchSuffix = $portVersion compat >= 1.12
+	cmd:cppunit_config$secondaryArchSuffix = $portVersion compat >= 1.12
+	cmd:DllPlugInTester$secondaryArchSuffix = $portVersion compat >= 1.12
+	lib:libcppunit$secondaryArchSuffix = $portVersion compat >= 1.12
+	lib:libcppunit_1.12$secondaryArchSuffix = $portVersion compat >= 1.12
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	cppunit${secondaryArchSuffix}_devel = $portVersion
+	devel:libcppunit$secondaryArchSuffix = $portVersion compat >= 1.12
+	"
+REQUIRES_devel="
+	cppunit$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:libtoolize
 	cmd:autoreconf
-	cmd:g++
-	cmd:ld
+	cmd:g++$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:sed
 	"
@@ -71,11 +78,3 @@ INSTALL()
 
 	packageEntries devel $developDir
 }
-
-PROVIDES_devel="
-	cppunit_devel = $portVersion
-	devel:libcppunit = $portVersion compat >= 1.12
-	"
-REQUIRES_devel="
-	cppunit == $portVersion base
-	"