diff --git a/openmsx-0.12.0-gcc6.patch b/openmsx-0.12.0-gcc6.patch
new file mode 100644
index 0000000..f622cc5
--- /dev/null
+++ b/openmsx-0.12.0-gcc6.patch
@@ -0,0 +1,22 @@
+diff -up openmsx-0.12.0/src/RTScheduler.cc~ openmsx-0.12.0/src/RTScheduler.cc
+--- openmsx-0.12.0/src/RTScheduler.cc~	2015-09-14 18:18:18.000000000 +0200
++++ openmsx-0.12.0/src/RTScheduler.cc	2016-02-21 11:07:59.539881004 +0100
+@@ -1,6 +1,7 @@
+ #include "RTScheduler.hh"
+ #include "RTSchedulable.hh"
+ #include <algorithm>
++#include <iterator>
+ #include <limits>
+ 
+ namespace openmsx {
+diff -up openmsx-0.12.0/src/video/ZMBVEncoder.cc~ openmsx-0.12.0/src/video/ZMBVEncoder.cc
+--- openmsx-0.12.0/src/video/ZMBVEncoder.cc~	2015-09-14 18:18:18.000000000 +0200
++++ openmsx-0.12.0/src/video/ZMBVEncoder.cc	2016-02-21 11:08:00.427885378 +0100
+@@ -10,6 +10,7 @@
+ #include <cstdlib>
+ #include <cstring>
+ #include <cmath>
++#include <iterator>
+ 
+ namespace openmsx {
+ 
diff --git a/openmsx.spec b/openmsx.spec
index c907d54..fc9491a 100644
--- a/openmsx.spec
+++ b/openmsx.spec
@@ -1,13 +1,14 @@
 Name:           openmsx
-Version:        0.11.0
-Release:        7%{?dist}
+Version:        0.12.0
+Release:        1%{?dist}
 Summary:        An emulator for the MSX home computer system
 Group:          Applications/Emulators
 License:        GPL+
-URL:            http://openmsx.sourceforge.net
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+URL:            http://openmsx.org/
+Source0:        https://github.com/openMSX/openMSX/releases/download/RELEASE_0_12_0/%{name}-%{version}.tar.gz
 Patch0:         openmsx-0.6.1-installbase.patch
-BuildRequires:  desktop-file-utils
+Patch1:         openmsx-0.12.0-gcc6.patch
+BuildRequires:  desktop-file-utils libappstream-glib
 BuildRequires:  docbook-utils
 BuildRequires:  glew-devel >= 1.3.2
 BuildRequires:  jack-audio-connection-kit-devel
@@ -17,6 +18,8 @@ BuildRequires:  SDL_image-devel SDL_ttf-devel freetype-devel
 BuildRequires:  tcl-devel >= 8.4.0
 BuildRequires:  zlib-devel
 BuildRequires:  python
+BuildRequires:  libvorbis-devel
+BuildRequires:  libtheora-devel
 Requires:       cbios-%{name}
 Requires:       hicolor-icon-theme
 
@@ -28,6 +31,7 @@ all aspects of the MSX with 100% accuracy.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Verbose compilation
 sed -i 's/@$(COMPILE_ENV)/$(COMPILE_ENV)/' build/main.mk
@@ -55,13 +59,14 @@ make %{?_smp_mflags} OPENMSX_FLAVOUR=rpm INSTALL_SHARE_DIR=%{_datadir}/%{name}\
 cat >%{name}.desktop <<EOF
 [Desktop Entry]
 Name=openMSX
-GenericName=An MSX Emulator
+GenericName=MSX Emulator
 Comment=%{summary}
 Exec=%{name}
 Icon=%{name}
 Terminal=false
 Type=Application
 Categories=Game;Emulator;
+Keywords=emulator;msx;openmsx;
 EOF
 
 # Build the man page
@@ -69,9 +74,9 @@ docbook2man doc/openmsx.sgml -o ./
 
 
 %install
-make %{?_smp_mflags} OPENMSX_FLAVOUR=rpm INSTALL_SHARE_DIR=%{_datadir}/%{name}\
-     INSTALL_DOC_DIR=%{_docdir}/%{name} \
-     DESTDIR=$RPM_BUILD_ROOT install
+%make_install OPENMSX_FLAVOUR=rpm INSTALL_SHARE_DIR=%{_datadir}/%{name}\
+     INSTALL_DOC_DIR=%{_docdir}/%{name}
+rm $RPM_BUILD_ROOT%{_docdir}/%{name}/GPL.txt
 
 # Move some things around
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/machines/*.txt \
@@ -111,30 +116,38 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <<EOF
 BugReportURL: BUGTRACKER DEAD
 SentUpstream: 2014-09-25
 -->
-<application>
-  <id type="desktop">openmsx.desktop</id>
+<component type="desktop">
+  <id>openmsx.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <name>openMSX</name>
   <summary>Emulate all aspects of the MSX with 100% accuracy</summary>
   <description>
     <p>
-      MSX is an old Z80-based family of home computers as an attempt to establish
+      OpenMSX is an emulator for the MSX home computer system. MSX is an old
+      Z80-based family of home computers as an attempt to establish
       a single standard in home computing similar to VHS in video.
     </p>
     <p>
-      The MSX standard died from year 1988.
-    </p>
-    <p>
       The MSX standard has been designed by a company called ASCII in Cooperation
-      with Microsoft which has provided a firmware version of his extended BASIC
-      (called "MicroSoft eXtended BASIC") for the machine, which explains the MSX name.
+      with Microsoft which has provided a firmware version of its extended BASIC
+      (called "MicroSoft eXtended BASIC") for the machine, which explains the
+      MSX name.
     </p>
   </description>
-  <url type="homepage">http://openmsx.sourceforge.net</url>
+  <url type="homepage">http://openmsx.org/</url>
+  <url type="help">http://openmsx.org/manual/user.html</url>
   <screenshots>
-    <screenshot type="default">http://openmsx.sourceforge.net/images/screenshots/mlimit3.png</screenshot>
+    <screenshot type="default">http://openmsx.org/images/screenshots/mlimit3.png</screenshot>
+    <screenshot>http://openmsx.org/images/screenshots/ide.png</screenshot>
+    <screenshot>http://openmsx.org/images/screenshots/tb-underwater.png</screenshot>
   </screenshots>
-</application>
+  <updatecontact>jwrdegoede_at_fedoraproject.org</updatecontact>
+</component>
 EOF
+appstream-util validate-relax --nonet \
+  $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -151,10 +164,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %doc %{_docdir}/%{name}
+%license doc/GPL.txt
 %{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/appdata/*%{name}.appdata.xml
-%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_mandir}/man1/%{name}.1.gz
 %dir %{_sysconfdir}/%{name}
@@ -162,6 +176,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sun Feb 21 2016 Hans de Goede <hdegoede@redhat.com> - 0.12.0-1
+- New upstream release 0.12.0 (rhbz#1306725)
+- Fix FTBFS (rhbz#1307827)
+- Improve appdata a bit
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index abf5e9b..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-b6f9c92f3921d9022b89b727c99897f0  openmsx-0.11.0.tar.gz