diff --git a/sqlitebrowser-3.10.0.tar.gz b/sqlitebrowser-3.10.0.tar.gz
new file mode 100644
index 0000000..472fc27
--- /dev/null
+++ b/sqlitebrowser-3.10.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:608475b5956bc7ebbfc80515a96b814abe9e0f9f2b040ac19fd8608d80163a56
+size 1990333
diff --git a/sqlitebrowser-3.9.1.tar.gz b/sqlitebrowser-3.9.1.tar.gz
deleted file mode 100644
index 66b3f09..0000000
--- a/sqlitebrowser-3.9.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d0d2e06a69927ba1d0b955f3261ce70c61befc5bd5ddaa06752dae8bb4219ed8
-size 1704713
diff --git a/sqlitebrowser.changes b/sqlitebrowser.changes
index 8f342a3..3772e7f 100644
--- a/sqlitebrowser.changes
+++ b/sqlitebrowser.changes
@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Wed Aug 30 14:24:07 UTC 2017 - mpluskal@suse.com
+
+- Correct license
+- Use more cmake macros
+- Use shared qscintilla library
+
+-------------------------------------------------------------------
+Tue Aug 29 16:59:44 UTC 2017 - wbauer@tmo.at
+
+- update to version 3.10.0
+  * Highlights
+    - DBHub.io integration
+      + Uploading and downloading of databases works
+      + Branching, forking, starring works, as does creating tags and releases
+      + There's a 100MB per database limit at the moment though, as it's still in development
+      + Backups aren't done on it (yet), so don't use it as your only place for storing important things (!!!)
+      + The front page is... not great. We're working on it.
+      + Still lots of upcoming stuff needing to be done. An API to query your databases, a cli, merging, discussions/issues
+      + Please report bugs, ideas, suggestions (etc) on the dbhub.io repo issue tracker as you find them.
+    - Many plot improvements (NULL values, progress dialog, remember settings, better colours, and bug fixes)
+    - Better table editing (foreign key editor, toggling the WITHOUT ROWID flag, temporary tables, ...)
+    - Better Import CSV dialog. It can now handle multiple CSV files at once
+    - Improved Index dialog and better index handling in general
+    - Better handling of virtual tables
+    - Filter improvements (ranges, NULL search)
+    - The usual improvements to the grammar parser
+  * See the full list of changes under
+    https://github.com/sqlitebrowser/sqlitebrowser/releases/tag/v3.10.0
+- switch back to cmake build
+- use system antlr on openSUSE, the problems seem to be fixed
+- unconditionally build with Qt5, Qt4 support has been dropped in
+  this release
+
 -------------------------------------------------------------------
 Thu Jan 19 12:38:53 UTC 2017 - hpj@urpla.net
 
diff --git a/sqlitebrowser.spec b/sqlitebrowser.spec
index 2c5b1cf..a0849b7 100644
--- a/sqlitebrowser.spec
+++ b/sqlitebrowser.spec
@@ -17,35 +17,34 @@
 
 
 Name:           sqlitebrowser
-Version:        3.9.1
+Version:        3.10.0
 Release:        0
 Summary:        Create, design and edit SQLite Databases
-License:        GPL-3.0+ or MPL-2.0
+License:        GPL-3.0+ AND MPL-2.0
 Group:          Productivity/Office/Organizers
 Url:            http://sqlitebrowser.org/
 Source0:        https://github.com/sqlitebrowser/sqlitebrowser/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        sqlitebrowser.1
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(sqlite3)
-Requires(post): hicolor-icon-theme
-Requires(post): update-desktop-files
-Requires(postun): hicolor-icon-theme
-Requires(postun): update-desktop-files
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-# not on SLE-12
-%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
-#BuildRequires:  antlr-devel
+BuildRequires:  libqscintilla_qt5-devel
 BuildRequires:  libqt5-linguist-devel
+BuildRequires:  pkgconfig
+BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5PrintSupport)
 BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(glib-2.0)
-%else
-BuildRequires:  libqt4-devel
+BuildRequires:  pkgconfig(sqlite3)
+Requires(post): hicolor-icon-theme
+Requires(post): update-desktop-files
+Requires(postun): hicolor-icon-theme
+Requires(postun): update-desktop-files
+# not on SLE-12
+%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
+BuildRequires:  antlr-devel
 %endif
 
 %description
@@ -71,21 +70,18 @@ to:
 %setup -q
 
 %build
-%if 0%{?suse_version} == 1315 && ! 0%{?is_opensuse}
-    %qmake CONFIG+=debug
-%else
-    %qmake5 CONFIG+=debug
-%endif
-
-make %{?_smp_mflags}
+%cmake \
+  -DQSCINTILLA_INCLUDE_DIR=%{_includedir}/qt5/Qsci \
+  -DQSCINTILLA_LIBRARY=%{_libdir}/libqscintilla2_qt5.so \
+  -DBUILD_SHARED_LIBS=OFF \
+  -Wno-dev
+%make_jobs
 
 %install
-install -Dm 0755 src/%{name} %{buildroot}/%{_bindir}/%{name}
-install -Dm 0644 distri/%{name}.desktop.appdata.xml %{buildroot}/%{_datadir}/appdata/%{name}.desktop.appdata.xml
-install -Dm 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/%{name}.1
-install -Dm 0644 src/icons/%{name}.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png
-install -Dm 0644 src/icons/%{name}.png %{buildroot}/%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
-mkdir -p %{buildroot}/%{_datadir}/applications 
+%cmake_install
+mkdir -p %{buildroot}/%{_bindir} %{buildroot}/%{_datadir}/{applications,pixmaps}
+install -D -m 0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/%{name}.1
+install    -m 0644 images/%{name}.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png
 cat > %{buildroot}/%{_datadir}/applications/%{name}.desktop << EOF
 [Desktop Entry]
 Categories=Application;Network;GNOME;GTK;System;X-SuSE-ServiceConfiguration;
@@ -108,7 +104,6 @@ EOF
 %icon_theme_cache_postun
 
 %files
-%defattr(-,root,root)
 %doc README.md LICENSE currentrelease
 %{_mandir}/man1/%{name}.1%{ext_man}
 %{_bindir}/%{name}