diff --git a/media-libs/game-music-emu/game_music_emu-0.6.1.recipe b/media-libs/game-music-emu/game_music_emu-0.6.2.recipe
similarity index 74%
rename from media-libs/game-music-emu/game_music_emu-0.6.1.recipe
rename to media-libs/game-music-emu/game_music_emu-0.6.2.recipe
index 2dfd47fa7..554dc70ea 100644
--- a/media-libs/game-music-emu/game_music_emu-0.6.1.recipe
+++ b/media-libs/game-music-emu/game_music_emu-0.6.2.recipe
@@ -13,20 +13,20 @@ support the following formats and systems:
 - VGM/VGZ   Sega Master System/Mark III, Sega Genesis/Mega Drive,BBC Micro"
 HOMEPAGE="https://bitbucket.org/mpyne/game-music-emu"
 COPYRIGHT="2002 Stephane Dallongeville
-2003-2009 Shay Green"
+	2003-2009 Shay Green"
 LICENSE="GNU LGPL v2.1"
-SOURCE_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-$portVersion.tar.bz2"
-CHECKSUM_SHA256="dc11bea098072d540d4d52dfb252e76fc3d3af67ee2807da48fbd8dbda3fd321"
+REVISION="1"
+SOURCE_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-$portVersion.tar.xz"
+CHECKSUM_SHA256="5046cb471d422dbe948b5f5dd4e5552aaef52a0899c4b2688e5a68a556af7342"
 SOURCE_DIR="game-music-emu-$portVersion"
 PATCHES="game_music_emu-$portVersion.patchset"
-REVISION="1"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	game_music_emu$secondaryArchSuffix = $portVersion
-	lib:libgme$secondaryArchSuffix = 0.6.1 compat >= 0
+	lib:libgme$secondaryArchSuffix = 0.6.2 compat >= 0
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -34,7 +34,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	game_music_emu${secondaryArchSuffix}_devel = $portVersion
-	devel:libgme$secondaryArchSuffix = 0.6.1 compat >= 0
+	devel:libgme$secondaryArchSuffix = 0.6.2 compat >= 0
 	"
 REQUIRES_devel="
 	haiku${secondaryArchSuffix}_devel
@@ -50,11 +50,18 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage game_music_emu$secondaryArchSuffix \
+	$libDir/libgme.so.0.6.2
+
 BUILD()
 {
 	mkdir -p build
 	cd build
-	cmake .. -DCMAKE_INSTALL_PREFIX=$prefix -DLIB_SUFFIX=/${secondaryArchSuffix#"_"}
+
+	cmake .. \
+		-DCMAKE_INSTALL_PREFIX=$prefix \
+		-DLIB_SUFFIX=/${secondaryArchSuffix#"_"}
+
 	make $jobArgs
 }
 
@@ -64,9 +71,9 @@ INSTALL()
 	make install
 
 	# Fixup install paths
-	mkdir -p $developDir
-	mkdir -p $includeDir/../
-	mv $prefix/include $includeDir
+	mkdir -p $developDir $includeDir
+	mv $prefix/include/* $includeDir
+	rm -rf $prefix/include
 
 	prepareInstalledDevelLib libgme
 	fixPkgconfig
diff --git a/media-libs/game-music-emu/patches/game_music_emu-0.6.1.patchset b/media-libs/game-music-emu/patches/game_music_emu-0.6.2.patchset
similarity index 100%
rename from media-libs/game-music-emu/patches/game_music_emu-0.6.1.patchset
rename to media-libs/game-music-emu/patches/game_music_emu-0.6.2.patchset