diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe b/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe
index a8eefad7c..e22da8758 100644
--- a/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe
+++ b/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe
@@ -8,32 +8,33 @@ COPYRIGHT="1999-2012 A. Schiffler"
 
 REVISION="1"
 
-ARCHITECTURES="x86 x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	sdl_gfx = $portVersion compat >= 2
+	sdl_gfx$secondaryArchSuffix = $portVersion compat >= 2
 	lib:libSDL_gfx = 14.9.1 compat >= 14
 	"
 
 REQUIRES="
-	haiku
-	libsdl
+	haiku$secondaryArchSuffix >= $haikuVersion
+	libsdl$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	devel:libsdl
+	devel:libsdl$secondaryArchSuffix
 	"
 	
 BUILD_PREREQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtool
 	cmd:make
 	cmd:pkg_config
-	cmd:sdl_config
+	cmd:sdl_config$secondaryArchSuffix
 	"
 
 SOURCE_DIR="SDL_gfx-$portVersion"
@@ -63,22 +64,28 @@ INSTALL()
 }
 
 PROVIDES_devel="
-	devel:SDL_gfx = 14.9.1 compat >= 0
-	devel:libSDL_gfx = 14.9.1 compat >= 0
-	devel:libSDL_gfx = $portVersion compat >= 2.0	
-	devel:sdl_gfx = 14.9.1 compat >= 0
+	sdl_gfx${secondaryArchSuffix}_devel = $portVersion compat >= 2
+	devel:sdl_gfx$secondaryArchSuffix = 14.9.1 compat >= 14
+	devel:libSDL_gfx$secondaryArchSuffix = 14.9.1 compat >= 14
 	"
 
 REQUIRES_devel="
-	sdl_gfx == $portVersion base
+	sdl_gfx$secondaryArchSuffix == $portVersion base
 	"
 
-
 TEST()
 {
 	cd Test
+	./autogen.sh
 	runConfigure ./configure
-# fails to configure due to missing sdl_gfx
 	make
-	ls
+	TestABGR
+	TestFonts
+	TestFramerate  	
+	TestImageFilter
+	TestGfxBlit
+	TestGfxPrimitives
+	TestGfxTexture	
+	TestRotozoom
+	TestShrink
 }
diff --git a/media-libs/sdl_image/sdl_image-1.2.12.recipe b/media-libs/sdl_image/sdl_image-1.2.12.recipe
index 8ebbdc8a9..f09a20aec 100644
--- a/media-libs/sdl_image/sdl_image-1.2.12.recipe
+++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe
@@ -7,22 +7,23 @@ REVISION="2"
 LICENSE="Zlib"
 COPYRIGHT="1997-2012 Sam Lantinga"
 
-ARCHITECTURES="x86 x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	sdl_image =$portVersion
-	lib:libSDL_image_1.2 = $portVersion compat >= 1.2
-	devel:libSDL_image = $portVersion compat >= 1.2
+	sdl_image$secondaryArchSuffix = $portVersion compat >= 1.2
+	lib:libSDL_image#secondaryArchSuffix = 1.2_0.8.4 compat >= 1.2_0
+	lib:libSDL_image_1.2 = $portVersion compat >= 0
 	"
 
 REQUIRES="
-	haiku
-	libsdl
+	haiku$secondaryArchSuffix
+	libsdl$secondaryArchSuffix
 	lib:libjpeg
 	"
 
 BUILD_REQUIRES="
-	devel:libsdl	
+	devel:libsdl$secondaryArchSuffix
 	lib:libjpeg
 	lib:libpng
 	lib:libtiff
@@ -31,15 +32,15 @@ BUILD_REQUIRES="
 	"
 	
 BUILD_PREREQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtool
 	cmd:make
 	cmd:pkg_config
-	cmd:sdl_config
+	cmd:sdl_config$secondaryArchSuffix
 	devel:libpng
 	devel:libjpeg
 #	devel:libtiff
@@ -64,18 +65,21 @@ INSTALL()
 {
 	make install
 
+	prepareInstalledDevelLibs libSDL_image \
+					libSDL_image-1.2
 	fixPkgconfig
-	prepareInstalledDevelLib libSDL_image
 
 	packageEntries devel \
 			$developDir
 }
 
 PROVIDES_devel="
-	devel:SDL_image = 0.8.4 compat >= 0
-	devel:libSDL_image = 0.8.4 compat >= 0
+	sdl_image${secondaryArchSuffix} = $portVersion compat >= 1.2
+	devel:sdl_image$secondaryArchSuffix = 0.8.4 compat >= 0
+	devel:libSDL_image$secondaryArchSuffix = 1.2_0.8.4 compat >= 0
+	devel:libSDL_image_1.2$secondaryArchSuffix = 0.8.4 compat >= 0
 	"
 
 REQUIRES_devel="
-	sdl_image == $portVersion base
+	sdl_image$secondaryArchSuffix == $portVersion base
 	"