diff --git a/app-text/htmltidy/htmltidy-20092812.recipe b/app-text/htmltidy/htmltidy-20092812.recipe
index 181f6287b..2531292b1 100644
--- a/app-text/htmltidy/htmltidy-20092812.recipe
+++ b/app-text/htmltidy/htmltidy-20092812.recipe
@@ -3,26 +3,27 @@ DESCRIPTION="htmltidy - Tidy the layout and correct errors in HTML and XML \
 documents."
 HOMEPAGE="http://tidy.sourceforge.net/"
 SOURCE_URI="cvs://:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy/tidy#12/28/2009"
-REVISION="1"
+REVISION="2"
 LICENSE="MIT"
 COPYRIGHT="1998-2008 World Wide Web Consortium"
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	htmltydy = $portVersion
-	cmd:tab2space
-	cmd:tidy
-	lib:libtidy_0.99
-	lib:libtidy
+	htmltidy$secondaryArchSuffix = $portVersion
+	cmd:tab2space$secondaryArchSuffix
+	cmd:tidy$secondaryArchSuffix
+	lib:libtidy_0.99$secondaryArchSuffix
+	lib:libtidy$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 PROVIDES_devel="
-	devel:libtidy
+	devel:libtidy$secondaryArchSuffix
 	"
 REQUIRES_devel="
-	htmltidy == $portVersion base
+	htmltidy$secondaryArchSuffix == $portVersion base
 	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
@@ -35,7 +36,7 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	"
 
-PATCHES="$portName-$portVersion.patchset"
+PATCHES="htmltidy-$portVersion.patchset"
 
 BUILD()
 {