diff --git a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe
index 76e780272..8e4a76c10 100644
--- a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe
+++ b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe
@@ -6,35 +6,37 @@ LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2001-2009 Ryan C. Gordon"
 REVISION="1"
 
-ARCHITECTURES="x86 x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	sdl_sound =$portVersion
+	sdl_sound$secondaryArchSuffix = $portVersion
 	cmd:playsound = $portVersion compat >= 2
 	cmd:playsound_simple = $portVersion compat >= 2
-	lib:libSDL_sound_1.0 = $portVersion compat >= 1.0
+	lib:libSDL_sound$secondaryArchSuffix = 1.0_0.8.0 compat >= 1.0_0
+	lib:libSDL_sound_1.0$secondaryArchSuffix = 0.8.0 compat >= 1.0
 	"
 
 REQUIRES="
-	haiku
-	libsdl
+	haiku$secondaryArchSuffix
+	libsdl$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	devel:libsdl
-	devel:libogg
+	devel:libsdl$secondaryArchSuffix
+	devel:libogg$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_sound-$portVersion"
@@ -54,7 +56,8 @@ INSTALL()
 {
 	make install
 
-	prepareInstalledDevelLib libSDL_sound
+	prepareInstalledDevelLibs libSDL_sound \
+					libSDL_sound-1.0
 	fixPkgconfig
 
 	packageEntries devel \
@@ -62,12 +65,12 @@ INSTALL()
 }
 
 PROVIDES_devel="
-	devel:SDL_sound = 0.8.0 compat >= 0
-	devel:libSDL_sound = 0.8.0 compat >= 0
-#	devel:libSDL_sound = $portVersion compat >= 1.0	
-	devel:sdl_sound = 0.0.0 compat >= 0
+	sdl_sound${secondaryArchSuffix}_devel = $portVersion compat >= 1.0
+	devel:SDL_sound$secondaryArchSuffix = 0.8.0 compat >= 0
+	devel:libSDL_sound$secondaryArchSuffix = 1.0_0.8.0 compat >= 1.0_0
+	devel:libSDL_sound_1.0$secondaryArchSuffix = 0.8.0 compat >= 0	
 	"
 
 REQUIRES_devel="
-	sdl_sound == $portVersion base
+	sdl_sound$secondaryArchSuffix == $portVersion base
 	"
diff --git a/media-libs/sdl_sound/sdl_sound-1.0_hg.recipe b/media-libs/sdl_sound/sdl_sound-1.0_hg.recipe
deleted file mode 100644
index 86fe30fca..000000000
--- a/media-libs/sdl_sound/sdl_sound-1.0_hg.recipe
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION="sdl-sound" 
-HOMEPAGE="http://www.icculus.org/SDL_sound" 
-SRC_URI="hg+http://hg.icculus.org/icculus/SDL_sound"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/libogg >= 1.1.4"
-BUILD()
-{
-	cd sdl-sound-1.0-hg
-	libtoolize --copy --force --install
-	./bootstrap
-	MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--libdir=$LIBDIR \
-		--mandir=$MANDIR
-	make
-}
-
-INSTALL()
-{
-	cd sdl-sound-1.0-hg
-	make install
-}
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="2001-2011 Ryan C. Gordon"