diff --git a/.gitignore b/.gitignore
index b4d8543..612c361 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /visualboyadvance-m-2.0.0-Beta3.tar.gz
 /visualboyadvance-m-2.0.0-6a7d494.tar.gz
 /visualboyadvance-m-2.0.0-git6a7d494.tar.gz
+/visualboyadvance-m-2.0.0-waylandplus.tar.gz
diff --git a/sources b/sources
index 30942fc..60b072f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (visualboyadvance-m-2.0.0-git6a7d494.tar.gz) = d622d01ae1d8ba402c48178a720f2273f1ad24390043105b607421b7b1254aa69ef8c2f0fbb65d7a930461cb77679c6edcba7f072275904ae21083e204546446
+SHA512 (visualboyadvance-m-2.0.0-waylandplus.tar.gz) = 100c58355d33127006d220c5cb83299580f40e4eb69ea46a5d5088d4e2baab6440b3143e1c79e62d1c649c8049c04e8f66d08e7bb101ed2943a0074cc6cf2800
diff --git a/visualboyadvance-m-2.0.0-refresh-on-wayland.patch b/visualboyadvance-m-2.0.0-refresh-on-wayland.patch
deleted file mode 100644
index 0f35fa3..0000000
--- a/visualboyadvance-m-2.0.0-refresh-on-wayland.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/wx/panel.cpp
-+++ b/src/wx/panel.cpp
-@@ -1427,6 +1427,10 @@ void DrawingPanel::PaintEv(wxPaintEvent& ev)
- 
-     DrawArea(dc);
-     DrawOSD(dc);
-+#ifndef NO_CAIRO
-+    if (!paused)
-+        GetWindow()->Refresh();
-+#endif
- }
- 
- void DrawingPanel::EraseBackground(wxEraseEvent& ev)
diff --git a/visualboyadvance-m-2.0.0-sdlfixes.patch b/visualboyadvance-m-2.0.0-sdlfixes.patch
new file mode 100644
index 0000000..dcd90e8
--- /dev/null
+++ b/visualboyadvance-m-2.0.0-sdlfixes.patch
@@ -0,0 +1,32 @@
+--- a/src/common/SoundSDL.cpp
++++ b/src/common/SoundSDL.cpp
+@@ -28,7 +28,7 @@ const float SoundSDL::_delay = 0.032f;
+ SoundSDL::SoundSDL():
+ 	_rbuf(0),
+ 	_dev(-1),
+-	current_rate(0),
++	current_rate(throttle),
+ 	_initialized(false)
+ {
+ 
+@@ -91,8 +91,9 @@ void SoundSDL::write(uint16_t * finalWave, int length)
+ 			SDL_SemWait(_semBufferEmpty);
+ 			if (throttle > 0 && throttle != current_rate)
+ 			{
+-				SDL_CloseAudio();
+-				init(soundGetSampleRate() * throttle / 100);
++				SDL_CloseAudioDevice(_dev);
++				//Reinit on throttle change:
++				init(soundGetSampleRate());
+ 				current_rate = throttle;
+ 			}
+ 		}
+@@ -113,7 +114,7 @@ void SoundSDL::write(uint16_t * finalWave, int length)
+ bool SoundSDL::init(long sampleRate)
+ {
+ 	SDL_AudioSpec audio;
+-	audio.freq = sampleRate;
++	audio.freq = sampleRate * throttle / 100;
+ 	audio.format = AUDIO_S16SYS;
+ 	audio.channels = 2;
+ 	audio.samples = 1024;
diff --git a/visualboyadvance-m-2.0.0-soundsync.patch b/visualboyadvance-m-2.0.0-soundsync.patch
deleted file mode 100644
index 901e4d0..0000000
--- a/visualboyadvance-m-2.0.0-soundsync.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/wx/wxvbam.cpp
-+++ b/src/wx/wxvbam.cpp
-@@ -259,6 +259,10 @@ bool wxvbamApp::OnInit()
-         gopts.render_method = RND_SIMPLE;
-     }
- 
-+    if (throttle == 0) {
-+        throttle = 100;
-+    }
-+
-     // process command-line options
-     for (int i = 0; i < pending_optset.size(); i++) {
-         wxString p = pending_optset[i];
diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec
index d9bbd8e..2f58801 100644
--- a/visualboyadvance-m.spec
+++ b/visualboyadvance-m.spec
@@ -2,23 +2,26 @@
 
 %global shortname vbam
 #Upstream git tag/commit:
-%global upstreamtag 6a7d49419cdcb51383403b3640cb92a3b3b36e1d
+%global upstreamtag waylandplus
 #Sanitized RC name (for fedora)
-%global rctagfedora git6a7d494
+%global rctagfedora waylandplus
 #RC Version that appears in app
-%global rcversion Beta-3
+%global rcversion Beta-3-waylandplus
 
 Name:           visualboyadvance-m
 Version:        2.0.0
-Release:        0.13%{?rctagfedora:.%{rctagfedora}}%{?dist}
+Release:        0.14%{?rctagfedora:.%{rctagfedora}}%{?dist}
 Summary:        High compatibility Gameboy Advance Emulator combining VBA builds
 
 License:        GPLv2
 Url:            http://www.vba-m.com
 Source0:        https://github.com/%{name}/%{name}/archive/%{upstreamtag}.tar.gz#/%{name}-%{version}%{?rctagfedora:-%{rctagfedora}}.tar.gz
-#Workaround for sound synchronization issues:
-#https://github.com/visualboyadvance-m/visualboyadvance-m/issues/51
-Patch0:         %{name}-%{version}-soundsync.patch
+#Fix for SDL issues:
+#https://github.com/visualboyadvance-m/visualboyadvance-m/pull/92
+Patch0:         %{name}-%{version}-sdlfixes.patch
+#Fix incorrect upstream bug tracker in app
+#https://github.com/visualboyadvance-m/visualboyadvance-m/pull/93
+Patch1:         %{name}-%{version}-bugtracker.patch
 BuildRequires:  cairo-devel
 BuildRequires:  cmake
 BuildRequires:  libjpeg-turbo-devel
@@ -139,6 +142,11 @@ fi
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
+* Sun Mar 05 2017 Jeremy Newton <alexjnewt AT hotmail DOT com> - 2.0.0-0.14.waylandplus
+- Update to new version
+- Add patch for SDL issues
+- Fix incorrect bug tracker link
+
 * Mon Feb 20 2017 Jeremy Newton <alexjnewt AT hotmail DOT com> - 2.0.0-0.13.git6a7d494
 - Update to git snapshot, fixes many issues
 - Drop wayland and openal fixes (better fixes have been upstreamed)