diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 7415663..edcbe7a 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1 +1,2 @@
+DIST VBA-M_Beta_2.tar.gz 3023671 SHA256 0469684aa8bde5939cff9f928717c8b1b1ccbb7f57132b1752afd1359e9421ce SHA512 ee9ea797c7fcbc89a0e6c51f764346a927d9cc5bc4d5c9b575ac38615e5e5e46949fdf34acfb35474bf4a0a9291dfccb11bbebd4ccd28c4cfccf2329421a645a WHIRLPOOL e79ee17266445c54f92dacf4529081653c7c618e0f79d5c00fbb370825702d8ef9ee084893ddd4b51a1bb50a7ec6b92305da9589818f1b0481e6159c19aecff9
 DIST vbam-2.0.0_pre1507.tar.xz 2169848 SHA256 08c512dee029118c65043a3b82caa1e96e49b7c522f3c0c4bed2e091846a0d51 SHA512 9f06fc871c674caf3cc936016b486e98ab1db129edac0ac3615b7b03cfb7b79d9cffa89f436577a9524a128987a6b65bfbbfa0ed602fe17e5dcfbdb56a445c2f WHIRLPOOL b1f926a9b24b0bc3a801c68e723b474f2ee1e60d9ae9851933935fc0bc234f089e1d565b7ceadcc1e2fe24792e7a54f7fc473a0aa545ee5a15bab5844d0df200
diff --git a/games-emulation/vbam/files/vbam-2.0.0_beta2-wx-cmakelists.patch b/games-emulation/vbam/files/vbam-2.0.0_beta2-wx-cmakelists.patch
new file mode 100644
index 0000000..4ab0b6e
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.0.0_beta2-wx-cmakelists.patch
@@ -0,0 +1,14 @@
+--- visualboyadvance-m-VBA-M_Beta_2/src/wx/CMakeLists.txt.old	2015-12-30 12:15:01.421560801 -0500
++++ visualboyadvance-m-VBA-M_Beta_2/src/wx/CMakeLists.txt	2015-12-30 12:16:24.812411444 -0500
+@@ -168,10 +168,11 @@
+ )
+ IF(WIN32)
+     INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION ${CMAKE_BINARY_DIR})
+ ENDIF(WIN32)
+ IF(NOT WIN32 AND NOT APPLE)
++    INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION /usr/games/bin)
+     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.desktop DESTINATION share/applications)
+ ENDIF(NOT WIN32 AND NOT APPLE)
+ 
+ if(APPLE)
+     # this should set ROM file types correctly
diff --git a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild b/games-emulation/vbam/vbam-2.0.0_alpha1507.ebuild
similarity index 94%
rename from games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
rename to games-emulation/vbam/vbam-2.0.0_alpha1507.ebuild
index f907be2..dc83e72 100644
--- a/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_alpha1507.ebuild
@@ -6,11 +6,13 @@ EAPI=5
 WX_GTK_VER="3.0"
 inherit cmake-utils wxwidgets gnome2-utils fdo-mime games
 
+MY_P=${P/alpha/pre}
+
 if [[ ${PV} == 9999 ]]; then
 	ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"
 	inherit subversion
 else
-	SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+	SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${MY_P}.tar.xz"
 	KEYWORDS="amd64 x86"
 fi
 
@@ -48,6 +50,8 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
+S="${WORKDIR}/${MY_P}"
+
 src_prepare() {
 	[[ ${PV} == 9999 ]] && subversion_src_prepare
 
@@ -56,7 +60,7 @@ src_prepare() {
 
 	sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
 		CMakeLists.txt src/{wx,gtk}/CMakeLists.txt || die
-	epatch "${FILESDIR}"/${P}-man.patch
+	epatch "${FILESDIR}"/${MY_P}-man.patch
 }
 
 src_configure() {
diff --git a/games-emulation/vbam/vbam-2.0.0_beta2.ebuild b/games-emulation/vbam/vbam-2.0.0_beta2.ebuild
new file mode 100644
index 0000000..eee875b
--- /dev/null
+++ b/games-emulation/vbam/vbam-2.0.0_beta2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+inherit cmake-utils wxwidgets gnome2-utils fdo-mime games
+
+if [[ ${PV} == 9999 ]]; then
+	ESVN_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
+	inherit git
+else
+	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/VBA-M_Beta_2.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
+HOMEPAGE="http://vba-m.com/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
+REQUIRED_USE="|| ( sdl gtk wxwidgets )"
+
+RDEPEND=">=media-libs/libpng-1.4:0=
+	media-libs/libsdl[sound]
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	link? ( >=media-libs/libsfml-2.0 )
+	ffmpeg? ( virtual/ffmpeg[-libav] )
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	sdl? ( media-libs/libsdl[joystick,opengl] )
+	gtk? ( >=dev-cpp/glibmm-2.4.0:2
+		>=dev-cpp/gtkmm-2.4.0:2.4
+		>=dev-cpp/gtkglextmm-1.2.0 )
+	wxwidgets? (
+		cairo? ( x11-libs/cairo )
+		openal? ( media-libs/openal )
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	)"
+DEPEND="${RDEPEND}
+	wxwidgets? ( || (
+		media-gfx/imagemagick
+		media-gfx/graphicsmagick[imagemagick] ) )
+	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+S="${WORKDIR}/visualboyadvance-m-VBA-M_Beta_2"
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && subversion_src_prepare
+
+	# fix issue with zlib-1.2.5.1 macros (bug #383179)
+	sed -i '1i#define OF(x) x' src/common/memgzio.c || die
+
+	sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
+		CMakeLists.txt src/{wx,gtk}/CMakeLists.txt || die
+	epatch "${FILESDIR}"/vbam-2.0.0_pre1507-man.patch
+	epatch "${FILESDIR}"/${P}-wx-cmakelists.patch
+}
+
+src_configure() {
+	append-cxxflags $(test-flags-CXX -std=gnu++11 -fpermissive)
+	local mycmakeargs=(
+		$(cmake-utils_use_enable cairo CAIRO)
+		$(cmake-utils_use_enable ffmpeg FFMPEG)
+		$(cmake-utils_use_enable gtk GTK)
+		$(cmake-utils_use_enable link LINK)
+		$(cmake-utils_use_enable lirc LIRC)
+		$(cmake-utils_use_enable nls NLS)
+		$(cmake-utils_use_enable openal OPENAL)
+		$(cmake-utils_use_enable sdl SDL)
+		$(cmake-utils_use_enable wxwidgets WX)
+		$(cmake-utils_use_enable x86 ASM_CORE)
+		$(cmake-utils_use_enable x86 ASM_SCALERS)
+		-DCMAKE_SKIP_RPATH=ON
+		-DDATA_INSTALL_DIR=share/games/${PN}
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	use sdl && dodoc doc/ReadMe.SDL.txt
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	[[ ${PV} == 9999 ]] && subversion_pkg_preinst
+
+	games_pkg_preinst
+	if use gtk || use wxwidgets ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	if use gtk || use wxwidgets ; then
+		gnome2_icon_cache_update
+		use gtk && fdo-mime_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use gtk || use wxwidgets ; then
+		gnome2_icon_cache_update
+		use gtk && fdo-mime_desktop_database_update
+	fi
+}