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.1.recipe
deleted file mode 100644
index 9d27c79e0..000000000
--- a/media-libs/game-music-emu/game_music_emu-0.6.1.recipe
+++ /dev/null
@@ -1,83 +0,0 @@
-SUMMARY="Collection of video game music file emulators"
-DESCRIPTION="Game_Music_Emu is a collection of video game music file emulators that
-support the following formats and systems:
-
-- AY        ZX Spectrum/Amstrad CPC
-- GBS       Nintendo Game Boy
-- GYM       Sega Genesis/Mega Drive
-- HES       NEC TurboGrafx-16/PC Engine
-- KSS       MSX Home Computer/other Z80 systems (doesn't support FM sound)
-- NSF/NSFE  Nintendo NES/Famicom (with VRC 6, Namco 106, and FME-7 sound)
-- SAP       Atari systems using POKEY sound chip
-- SPC       Super Nintendo/Super Famicom
-- 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"
-LICENSE="GNU LGPL v2.1"
-REVISION="2"
-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-0.6.2.patchset"
-
-ARCHITECTURES="x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	game_music_emu$secondaryArchSuffix = $portVersion
-	lib:libgme$secondaryArchSuffix = 0.6.1 compat >= 0
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	game_music_emu${secondaryArchSuffix}_devel = $portVersion
-	devel:libgme$secondaryArchSuffix = 0.6.1 compat >= 0
-	"
-REQUIRES_devel="
-	game_music_emu$secondaryArchSuffix == $portVersion base
-	haiku${secondaryArchSuffix}_devel
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	"
-
-defineDebugInfoPackage game_music_emu$secondaryArchSuffix \
-	$libDir/libgme.so.0.6.1
-
-BUILD()
-{
-	mkdir -p build
-	cd build
-
-	cmake .. \
-		-DCMAKE_INSTALL_PREFIX=$prefix \
-		-DLIB_SUFFIX=/${secondaryArchSuffix#"_"}
-
-	make $jobArgs
-}
-
-INSTALL()
-{
-	cd build
-	make install
-
-	# Fixup install paths
-	mkdir -p $developDir $includeDir
-	mv $prefix/include/* $includeDir
-	rm -rf $prefix/include
-
-	prepareInstalledDevelLib libgme
-	fixPkgconfig
-
-	packageEntries devel \
-		$developDir
-}
diff --git a/media-libs/game-music-emu/game_music_emu-0.6.2.recipe b/media-libs/game-music-emu/game_music_emu-0.6.3.recipe
similarity index 74%
rename from media-libs/game-music-emu/game_music_emu-0.6.2.recipe
rename to media-libs/game-music-emu/game_music_emu-0.6.3.recipe
index 210fd5e81..5f407614a 100644
--- a/media-libs/game-music-emu/game_music_emu-0.6.2.recipe
+++ b/media-libs/game-music-emu/game_music_emu-0.6.3.recipe
@@ -1,5 +1,5 @@
 SUMMARY="Collection of video game music file emulators"
-DESCRIPTION="Game_Music_Emu is a collection of video game music file emulators that
+DESCRIPTION="Game_Music_Emu is a collection of video game music file emulators that \
 support the following formats and systems:
 
 - AY        ZX Spectrum/Amstrad CPC
@@ -15,34 +15,39 @@ HOMEPAGE="https://bitbucket.org/mpyne/game-music-emu"
 COPYRIGHT="2002 Stephane Dallongeville
 	2003-2009 Shay Green"
 LICENSE="GNU LGPL v2.1"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-$portVersion.tar.xz"
-CHECKSUM_SHA256="5046cb471d422dbe948b5f5dd4e5552aaef52a0899c4b2688e5a68a556af7342"
+CHECKSUM_SHA256="aba34e53ef0ec6a34b58b84e28bf8cfbccee6585cebca25333604c35db3e051d"
 SOURCE_DIR="game-music-emu-$portVersion"
 PATCHES="game_music_emu-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersionCompat="$portVersion compat >= ${portVersion%.*.*}"
+
 PROVIDES="
 	game_music_emu$secondaryArchSuffix = $portVersion
-	lib:libgme$secondaryArchSuffix = 0.6.2 compat >= 0
+	lib:libgme$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	game_music_emu${secondaryArchSuffix}_devel = $portVersion
-	devel:libgme$secondaryArchSuffix = 0.6.2 compat >= 0
+	devel:libgme$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	game_music_emu$secondaryArchSuffix == $portVersion base
 	haiku${secondaryArchSuffix}_devel
+	devel:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
@@ -51,7 +56,7 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage game_music_emu$secondaryArchSuffix \
-	$libDir/libgme.so.0.6.2
+	$libDir/libgme.so.$portVersion
 
 BUILD()
 {
@@ -60,21 +65,26 @@ BUILD()
 
 	cmake .. \
 		-DCMAKE_INSTALL_PREFIX=$prefix \
-		-DLIB_SUFFIX=/${secondaryArchSuffix#"_"}
+		-DLIB_SUFFIX=/${secondaryArchSuffix#"_"} \
+		-DENABLE_UBSAN=OFF
 
 	make $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install
+	make -C build install
 
 	# Fixup install paths
 	mkdir -p $developDir $includeDir
 	mv $prefix/include/* $includeDir
 	rm -rf $prefix/include
 
+	# copy develop documentation
+	mkdir -p $developDocDir
+	cp -rd $sourceDir/{design,gme,readme}.txt $developDocDir
+
+
 	prepareInstalledDevelLib libgme
 	fixPkgconfig
 
diff --git a/media-libs/game-music-emu/patches/game_music_emu-0.6.2.patchset b/media-libs/game-music-emu/patches/game_music_emu-0.6.3.patchset
similarity index 100%
rename from media-libs/game-music-emu/patches/game_music_emu-0.6.2.patchset
rename to media-libs/game-music-emu/patches/game_music_emu-0.6.3.patchset