diff --git a/qtlockedfile.spec b/qtlockedfile.spec
index 4f5e3df..0ab196b 100644
--- a/qtlockedfile.spec
+++ b/qtlockedfile.spec
@@ -1,13 +1,16 @@
-%global commit	17b56547d6e0d9a06603231fe2384474f9144829
+%global commit0	   5a07df503a6f01280f493cbcc2aace462b9dee57
+%global commitdate 20150629
+
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Summary:	QFile extension with advisory locking functions
 Name:		qtlockedfile
 Version:	2.4
-Release:	17%{?dist}
+Release:	18.%{commitdate}git%{shortcommit0}%{?dist}
 
 License:	GPLv3 or LGPLv2 with exceptions
 URL:		http://doc.qt.digia.com/solutions/4/qtlockedfile/qtlockedfile.html
-Source0:	https://qt.gitorious.org/qt-solutions/qt-solutions/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz
+Source0:	https://github.com/qtproject/qt-solutions/archive/%{commit0}.tar.gz#/%{name}-%{commit0}.tar.gz
 Source1:	qtlockedfile.prf
 # Proposed upstream in https://codereview.qt-project.org/#/c/92411/
 Source2:	LICENSE.LGPL
@@ -15,8 +18,6 @@ Source2:	LICENSE.LGPL
 Source3:	LGPL_EXCEPTION
 # Proposed upstream in https://codereview.qt-project.org/#/c/92411/
 Source4:	LICENSE.GPL3
-Patch0:		qtlockedfile-use-current-version.patch
-Patch1:		qtlockedfile-dont-build-example.patch
 
 BuildRequires:	qt4-devel qt5-qtbase-devel
 
@@ -59,10 +60,11 @@ that use QtLockedFile with Qt5.
 
 
 %prep
-%setup -qnqt-solutions-qt-solutions/%{name}
-%patch0
-%patch1
+%setup -qn qt-solutions-%{commit0}/%{name}
+# use versioned soname
 sed -i s,head,%{version}, common.pri
+# do not build example source
+sed -i /example/d %{name}.pro
 mkdir licenses
 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} licenses
 
@@ -81,25 +83,17 @@ popd
 %install
 # libraries
 mkdir -p %{buildroot}%{_libdir}
-cp -a lib/* %{buildroot}%{_libdir}
+cp -ap lib/* %{buildroot}%{_libdir}
 
 # headers
-for qtdir in %{_qt4_headerdir} %{_qt5_headerdir} ; do
- d=%{buildroot}$qtdir/QtSolutions ;
- mkdir -p $d ;
- cp -a \
-    src/qtlockedfile.h \
-    src/QtLockedFile \
-    $d ;
-done
+mkdir -p %{buildroot}%{_qt4_headerdir}/QtSolutions %{buildroot}%{_qt5_headerdir}
+cp -ap src/qtlockedfile.h src/QtLockedFile %{buildroot}%{_qt4_headerdir}/QtSolutions
+cp -ap %{buildroot}%{_qt4_headerdir}/QtSolutions %{buildroot}%{_qt5_headerdir}
 
 install -p -D -m644 %{SOURCE1} %{buildroot}%{_qt4_datadir}/mkspecs/features/qtlockedfile.prf
 install -p -D -m644 %{SOURCE1} %{buildroot}%{_qt5_archdatadir}/mkspecs/features/qtlockedfile.prf
 
 
-%clean
-rm -rf %{buildroot}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -131,6 +125,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jul 27 2015 Raphael Groner <projects.rg@smart.ms> - 2.4-18.20150629git5a07df5
+- apply Qt5 fixes of upstream (rhbz#1239869)
+- use sources from github instead of gitlab
+- remove obsoleted patches
+- simplify installation of header files
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild