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
new file mode 100644
index 000000000..9d27c79e0
--- /dev/null
+++ b/media-libs/game-music-emu/game_music_emu-0.6.1.recipe
@@ -0,0 +1,83 @@
+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.2.recipe
index bb63efad6..210fd5e81 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.2.recipe
@@ -15,13 +15,13 @@ HOMEPAGE="https://bitbucket.org/mpyne/game-music-emu"
 COPYRIGHT="2002 Stephane Dallongeville
 	2003-2009 Shay Green"
 LICENSE="GNU LGPL v2.1"
-REVISION="1"
+REVISION="2"
 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"
 
-ARCHITECTURES="x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="