diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe b/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
index 93c4e3985..b849bfbb6 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
@@ -7,13 +7,13 @@ It combines an easy-to-use interface, fun sound effects, and an \
 encouraging cartoon mascot who guides children as they use the program.
 "
 HOMEPAGE="http://www.tuxpaint.org/" 
-SRC_URI="http://sourceforge.net/projects/tuxpaint/files/tuxpaint/0.9.22/tuxpaint-0.9.22.tar.gz"
+SRC_URI="http://sourceforge.net/projects/tuxpaint/files/tuxpaint/0.9.22/tuxpaint-$portVersion.tar.gz"
 CHECKSUM_SHA256="8abd932f8e36fad795bba0290c094c9c221e424c4b9aa8c763b7fb3459cb2be3"
 COPYRIGHT="2002-2010 Bill Kendrick and others"
 LICENSE="GNU GPL v2"
 REVISION="1"
 
-ARCHITECTURES="x86 x86_gcc2 x86_64"
+ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
 
 PATCHES="tuxpaint-$portVersion.patchset"
 
@@ -22,7 +22,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku
+	haiku >= $haikuVersion
 	lib:libfribidi
 	lib:libiconv
 	lib:libintl
@@ -36,6 +36,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
+	haiku_devel  >= $haikuVersion
 	devel:libfribidi
 	devel:libiconv
 	devel:libintl
@@ -49,7 +50,6 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:make
 	cmd:gcc
 	cmd:gperf