diff --git a/gbrainy-2.2.7.tar.gz b/gbrainy-2.2.7.tar.gz
deleted file mode 100644
index 0fefc3a..0000000
--- a/gbrainy-2.2.7.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f400675178e02b78ac8e1111a237119a57cc77348bea0f143f51356615edfadb
-size 2933715
diff --git a/gbrainy-2.3.1.tar.gz b/gbrainy-2.3.1.tar.gz
new file mode 100644
index 0000000..75c8476
--- /dev/null
+++ b/gbrainy-2.3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4048a26f9d4d622c539c02d3ce9163f53bc32334aef20dfd88cc36ef18d88819
+size 2939658
diff --git a/gbrainy.changes b/gbrainy.changes
index 2be0029..bc74fe0 100644
--- a/gbrainy.changes
+++ b/gbrainy.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Thu Nov  3 12:45:22 UTC 2016 - dimstar@opensuse.org
+
+- Update to version 2.3.1:
+  + Port to new documentation infrastructure.
+  + Better metadata describing the app for software centers.
+  + Small bug fixes.
+  + Updated translations.
+- Replace gnome-doc-utils-devel BuildRequires for yelp-tools,
+  following upstreams port to the new documentation infrastructure.
+- Drop gbrainy-appdata-workaround.patch: fixed upstream.
+
+-------------------------------------------------------------------
+Sun Aug 21 09:18:17 UTC 2016 - mailaender@opensuse.org
+
+- Update to version 2.3.0:
+  + Ported to Gtk3.
+  + Small fixes.
+  + Updated translations.
+- Add gbrainy-appdata-workaround.patch: Directly link to https.
+  Fixed upstream already (bgo#770604).
+- Replace BuildRequirements:
+  + gtk-sharp2 for pkgconfig(gtk-sharp-3.0).
+  + pkgconfig(libcanberra-gtk) for pkgconfig(libcanberra-gtk3).
+  + librsvg-devel for pkgconfig(librsvg-2.0).
+  + mono-addins for pkgconfig(mono-addins).
+  + mono-devel for pkgconfig(mono).
+
 -------------------------------------------------------------------
 Tue Jan 12 14:53:37 UTC 2016 - dimstar@opensuse.org
 
diff --git a/gbrainy.spec b/gbrainy.spec
index 4314b2c..a98a55c 100644
--- a/gbrainy.spec
+++ b/gbrainy.spec
@@ -17,7 +17,7 @@
 
 
 Name:           gbrainy
-Version:        2.2.7
+Version:        2.3.1
 Release:        0
 Summary:        A brain teaser game and trainer
 License:        GPL-2.0+
@@ -27,20 +27,21 @@ Source:         http://gent.softcatala.org/jmas/gbrainy/%{name}-%{version}.tar.g
 # PATCH-FIX-OPENSUSE -- gbrainy-use-libexecdir.patch
 Patch0:         gbrainy-use-libexecdir.patch
 BuildRequires:  fdupes
-BuildRequires:  gnome-doc-utils-devel
-BuildRequires:  gtk-sharp2
 BuildRequires:  intltool
-BuildRequires:  librsvg-devel
-BuildRequires:  mono-addins
-BuildRequires:  mono-devel >= 3.0.0
+BuildRequires:  pkgconfig
 BuildRequires:  translation-update-upstream
-BuildRequires:  pkgconfig(libcanberra-gtk) >= 0.26
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
 BuildRequires:  update-desktop-files
+BuildRequires:  yelp-tools
+BuildRequires:  pkgconfig(gtk-sharp-3.0)
+BuildRequires:  pkgconfig(libcanberra-gtk3) >= 0.26
+BuildRequires:  pkgconfig(librsvg-2.0)
+BuildRequires:  pkgconfig(mono) >= 4.0.0
+BuildRequires:  pkgconfig(mono-addins)
 Recommends:     %{name}-lang
 # For the help system to work, we require a ghelp:// URI handler.
 Recommends:     mimehandler(x-scheme-handler/ghelp)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 gbrainy is a brain teaser game and trainer to have fun and to keep
@@ -67,10 +68,10 @@ translation-update-upstream
 %lang_package
 
 %build
-export MONO_SHARED_DIR=/var/tmp
+export MONO_SHARED_DIR=%{_localstatedir}/tmp
 %configure \
         --disable-static
-make
+make %{?_smp_mflags}
 
 %install
 %make_install
@@ -97,19 +98,17 @@ chmod -x %{buildroot}%{_libexecdir}/%{name}/gbrainy.exe.config
 %files
 %defattr(-,root,root)
 %doc AUTHORS NEWS README COPYING
-%dir %{_datadir}/gnome/
-%dir %{_datadir}/gnome/help/
-%dir %{_datadir}/gnome/help/gbrainy/
-%doc %{_datadir}/gnome/help/gbrainy/C/
-%{_bindir}/gbrainy
-%{_libexecdir}/gbrainy/
-%{_datadir}/games/gbrainy/
+%{_bindir}/%{name}
+%{_libexecdir}/%{name}/
+%{_datadir}/games/%{name}/
+%{_datadir}/help/C/%{name}/
 %dir %{_datadir}/appdata
-%{_datadir}/appdata/gbrainy.appdata.xml
-%{_datadir}/applications/gbrainy.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/*
-%{_mandir}/man6/gbrainy.6.gz
+%{_mandir}/man6/%{name}.6%{?ext_man}
 
 %files lang -f %{name}.lang
+%defattr(-,root,root)
 
 %changelog