diff --git a/Fix-build-with-Qt-511.patch b/Fix-build-with-Qt-511.patch
new file mode 100644
index 0000000..df335ce
--- /dev/null
+++ b/Fix-build-with-Qt-511.patch
@@ -0,0 +1,28 @@
+commit 1578fcb4a0407cf368edb6ee4605c4ef9e77b6ed
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Tue Mar 20 00:06:46 2018 +0100
+
+    Fix build with Qt 5.11 (missing headers)
+    
+    Reviewers: #kexi, staniek
+    
+    Reviewed By: #kexi, staniek
+    
+    Subscribers: staniek
+    
+    Tags: #kexi
+    
+    Differential Revision: https://phabricator.kde.org/D11503
+
+diff --git a/src/main/startup/KexiNewProjectAssistant.cpp b/src/main/startup/KexiNewProjectAssistant.cpp
+index 59e819acc..6568f1b5c 100644
+--- a/src/main/startup/KexiNewProjectAssistant.cpp
++++ b/src/main/startup/KexiNewProjectAssistant.cpp
+@@ -48,6 +48,7 @@
+ #include <KIconLoader>
+ #include <KStandardGuiItem>
+ 
++#include <QAction>
+ #include <QDebug>
+ #include <QLayout>
+ #include <QCheckBox>
diff --git a/kexi.changes b/kexi.changes
index b1de127..c30540c 100644
--- a/kexi.changes
+++ b/kexi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Jun  3 19:37:31 UTC 2018 - christophe@krop.fr
+
+- Add Fix-build-with-Qt-511.patch
+- Run spec-cleaner
+
 -------------------------------------------------------------------
 Tue Mar 20 11:28:47 UTC 2018 - wbauer@tmo.at
 
diff --git a/kexi.spec b/kexi.spec
index feb96e7..5b25d58 100644
--- a/kexi.spec
+++ b/kexi.spec
@@ -15,31 +15,24 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%bcond_without lang
+
 %define soVersion 3.1
+%bcond_without lang
 Name:           kexi
 Version:        3.1.0
 Release:        0
-License:        GPL-2.0+ and LGPL-2.1+ and GFDL-1.2
 Summary:        Database Application
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later AND GFDL-1.2-only
 Group:          Productivity/Office/Suite
-Url:            http://www.kexi-project.org/
+URL:            http://www.kexi-project.org/
 Source0:        http://download.kde.org/stable/%{name}/src/%{name}-%{version}.tar.xz
 # PATCH-FIX-UPSTREAM
 Patch0:         Install-the-application-icons.patch
 # PATCH-FIX-UPSTREAM
 Patch1:         fix-build-with-qt5.6.patch
+# PATCH-FIX-UPSTREAM -- Fix-build-with-Qt-511.patch
+Patch2:         Fix-build-with-Qt-511.patch
 BuildRequires:  breeze5-icons
-BuildRequires:  cmake(Qt5Core)
-BuildRequires:  cmake(Qt5Gui)
-BuildRequires:  cmake(Qt5PrintSupport)
-BuildRequires:  cmake(Qt5UiTools)
-BuildRequires:  cmake(Qt5Widgets)
-BuildRequires:  cmake(Qt5Xml)
-BuildRequires:  cmake(Qt5Network)
-BuildRequires:  cmake(Qt5Test)
-BuildRequires:  cmake(Qt5WebKit)
-BuildRequires:  cmake(Qt5WebKitWidgets)
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
 BuildRequires:  glib2-devel
@@ -68,14 +61,23 @@ BuildRequires:  marble-devel
 BuildRequires:  mysql-devel
 BuildRequires:  postgresql-devel
 BuildRequires:  update-desktop-files
-%if %{with lang}
-Recommends:     %{name}-lang = %{version}
-%endif
+BuildRequires:  cmake(Qt5Core)
+BuildRequires:  cmake(Qt5Gui)
+BuildRequires:  cmake(Qt5Network)
+BuildRequires:  cmake(Qt5PrintSupport)
+BuildRequires:  cmake(Qt5Test)
+BuildRequires:  cmake(Qt5UiTools)
+BuildRequires:  cmake(Qt5WebKit)
+BuildRequires:  cmake(Qt5WebKitWidgets)
+BuildRequires:  cmake(Qt5Widgets)
+BuildRequires:  cmake(Qt5Xml)
 Obsoletes:      calligra-kexi < %{version}
 Provides:       calligra-kexi = %{version}
 # not ported yet
 Obsoletes:      calligra-kexi-spreadsheet-import < %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if %{with lang}
+Recommends:     %{name}-lang = %{version}
+%endif
 
 %description
 Kexi is a visual database applications creator, competing with
@@ -83,7 +85,7 @@ programs like MS Access or Filemaker.
 
 %package spreadsheet-import
 Summary:        Spreadsheet-to-Kexi-table import plugin
-License:        GPL-2.0+ and LGPL-2.1+
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Productivity/Office/Suite
 Obsoletes:      calligra-kexi-spreadsheet-import < %{version}
 Provides:       calligra-kexi-spreadsheet-import = %{version}
@@ -99,9 +101,7 @@ This package contains a Spreadsheet-to-Kexi-table import plugin.
 %endif
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1
 
 %build
 # install translations to %{_kf5_localedir} so they don't clash with the kexi translations in calligra-l10n (KDE4 based)
@@ -123,26 +123,24 @@ done
 rm %{buildroot}%{_kf5_libdir}/libkformdesigner%{soVersion}.so
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS README.md COPYING COPYING.*
-%{_bindir}/kexi-%{soVersion}
-%{_libdir}/libkexi*.so*
-%{_libdir}/libkformdesigner%{soVersion}.so*
+%license COPYING COPYING.*
+%doc AUTHORS README.md
 %dir %{_kf5_appstreamdir}
-%{_kf5_appstreamdir}/org.kde.kexi-%{soVersion}.appdata.xml
-%{_kf5_applicationsdir}/org.kde.kexi-%{soVersion}.desktop
 %dir %{_kf5_iconsdir}/hicolor/1024x1024
 %dir %{_kf5_iconsdir}/hicolor/1024x1024/apps
+%{_kf5_applicationsdir}/org.kde.kexi-%{soVersion}.desktop
+%{_kf5_appstreamdir}/org.kde.kexi-%{soVersion}.appdata.xml
+%{_kf5_bindir}/kexi-%{soVersion}
 %{_kf5_iconsdir}/hicolor/*/*/*
-%{_kf5_sharedir}/kexi/
+%{_kf5_libdir}/libkexi*.so*
+%{_kf5_libdir}/libkformdesigner%{soVersion}.so*
 %{_kf5_plugindir}/kexi/
+%{_kf5_sharedir}/kexi/
 
 %files lang
-%defattr(-,root,root,-)
 %{_kf5_localedir}
 
 %changelog