diff --git a/srcpkgs/vba-m/template b/srcpkgs/vba-m/template
index 8385941169e..7b3405b4ac8 100644
--- a/srcpkgs/vba-m/template
+++ b/srcpkgs/vba-m/template
@@ -1,20 +1,24 @@
 # Template file for 'vbam'
 pkgname=vba-m
-version=1292
-revision=2
-wrksrc=sources
+reverts=1292_2
+version=2.0.0
+revision=1
+_subversion=Beta-3
+wrksrc="visualboyadvance-m-${_subversion}"
 build_style=cmake
-hostmakedepends="unzip pkg-config"
-makedepends="zlib-devel libpng-devel MesaLib-devel SDL-devel gtkmm2-devel gtkglext-devel gtkglextmm-devel ffmpeg-devel gtk+-devel SFML-devel"
+hostmakedepends="unzip pkg-config zip"
+makedepends="zlib-devel libpng-devel MesaLib-devel SDL2-devel libopenal-devel gtkmm2-devel
+gtkglext-devel gtkglextmm-devel ffmpeg-devel gtk+-devel SFML-devel wxWidgets-devel"
 short_desc="Gameboy Advance Emulator"
 maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
 license="GPL-2"
-homepage="http://sourceforge.net/projects/vbam/"
-distfiles="${SOURCEFORGE_SITE}/project/vbam/vbam-src/${pkgname}-SVN${version}-sources.zip"
-checksum=edaca73fb9887eef6bab3d573b54c058e3412823e5bdcb3b1b76c4ce9f7ea3eb
+homepage="https://github.com/visualboyadvance-m/visualboyadvance-m/"
+distfiles="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/${_subversion}.tar.gz"
+checksum=100176bdf31f27211876bac72a297e5545189aebf74c8fe7ddf5a943a39e79b0
 configure_args="-DENABLE_GTK=TRUE -DENABLE_FFMPEG=TRUE -DENABLE_LINK=TRUE"
-conf_files="/etc/vbam.cfg"
 
 pre_configure() {
 	sed 's|Common/|common/|' -i src/gba/debugger-expr-yacc.cpp
+	sed 's|wxrc|wxrc-3.0|g' -i src/wx/CMakeLists.txt
+	sed 's|wxrc|wxrc-3.0|g' -i po/update_pot.sh
 }
diff --git a/srcpkgs/vba-m/update b/srcpkgs/vba-m/update
deleted file mode 100644
index 3510da32676..00000000000
--- a/srcpkgs/vba-m/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site='http://sourceforge.net/projects/vbam/files/vbam-src'
-pattern='vba.?m-[a-zA-Z]+\K\d+'