diff --git a/dev-games/physfs/physfs-2.0.3.recipe b/dev-games/physfs/physfs-2.0.3.recipe
index 9cd871976..9168ccd53 100644
--- a/dev-games/physfs/physfs-2.0.3.recipe
+++ b/dev-games/physfs/physfs-2.0.3.recipe
@@ -6,14 +6,15 @@ CHECKSUM_MD5="c2c727a8a8deb623b521b52d0080f613"
 LICENSE="PHYSFS"
 COPYRIGHT="2001-2012 Ryan C. Gordon"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 REVISION="1"
 
 PROVIDES="
 	physfs$secondaryArchSuffix = $portVersion
 	lib:libphysfs$secondaryArchSuffix = $portVersion
+	cmd:test_physfs
 	"
 
 REQUIRES="
@@ -22,11 +23,11 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	devel:libz$secondaryArchSuffix >= 1.0.4
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:cmake
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
@@ -34,7 +35,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	cmake . -DLIBRARY_OUTPUT_PATH:=$libDir
+	cmake . -DCMAKE_INSTALL_PREFIX=$prefix
 	make $jobArgs
 }
 
@@ -45,6 +46,10 @@ INSTALL()
 	prepareInstalledDevelLib libphysfs
 	fixPkgconfig
 	
+	mkdir -p $includeDir
+	mv $prefix/include/*.h $includeDir
+	rm -rf $prefix/include
+	
 	# devel package
 	packageEntries devel \
 			$developDir