diff --git a/media-libs/game-music-emu/game_music_emu-0.6.0.recipe b/media-libs/game-music-emu/game_music_emu-0.6.1.recipe
similarity index 83%
rename from media-libs/game-music-emu/game_music_emu-0.6.0.recipe
rename to media-libs/game-music-emu/game_music_emu-0.6.1.recipe
index da535dd47..2dfd47fa7 100644
--- a/media-libs/game-music-emu/game_music_emu-0.6.0.recipe
+++ b/media-libs/game-music-emu/game_music_emu-0.6.1.recipe
@@ -15,8 +15,8 @@ HOMEPAGE="https://bitbucket.org/mpyne/game-music-emu"
 COPYRIGHT="2002 Stephane Dallongeville
 2003-2009 Shay Green"
 LICENSE="GNU LGPL v2.1"
-SOURCE_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-0.6.0.tar.bz2"
-CHECKSUM_SHA256="506e81d0c61e1a26d503fbf5351503e0b31f9fbb374cb1f09979758b46a24987"
+SOURCE_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-$portVersion.tar.bz2"
+CHECKSUM_SHA256="dc11bea098072d540d4d52dfb252e76fc3d3af67ee2807da48fbd8dbda3fd321"
 SOURCE_DIR="game-music-emu-$portVersion"
 PATCHES="game_music_emu-$portVersion.patchset"
 REVISION="1"
@@ -26,7 +26,7 @@ SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	game_music_emu$secondaryArchSuffix = $portVersion
-	lib:libgme$secondaryArchSuffix = 0.6.0 compat >= 0
+	lib:libgme$secondaryArchSuffix = 0.6.1 compat >= 0
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -34,7 +34,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	game_music_emu${secondaryArchSuffix}_devel = $portVersion
-	devel:libgme$secondaryArchSuffix = 0.6.0 compat >= 0
+	devel:libgme$secondaryArchSuffix = 0.6.1 compat >= 0
 	"
 REQUIRES_devel="
 	haiku${secondaryArchSuffix}_devel
@@ -54,7 +54,7 @@ BUILD()
 {
 	mkdir -p build
 	cd build
-	cmake .. -DCMAKE_INSTALL_PREFIX=$prefix
+	cmake .. -DCMAKE_INSTALL_PREFIX=$prefix -DLIB_SUFFIX=/${secondaryArchSuffix#"_"}
 	make $jobArgs
 }
 
@@ -65,6 +65,7 @@ INSTALL()
 
 	# Fixup install paths
 	mkdir -p $developDir
+	mkdir -p $includeDir/../
 	mv $prefix/include $includeDir
 
 	prepareInstalledDevelLib libgme
diff --git a/media-libs/game-music-emu/patches/game_music_emu-0.6.0.patchset b/media-libs/game-music-emu/patches/game_music_emu-0.6.1.patchset
similarity index 100%
rename from media-libs/game-music-emu/patches/game_music_emu-0.6.0.patchset
rename to media-libs/game-music-emu/patches/game_music_emu-0.6.1.patchset