$ git diff --patch-with-stat --summary 5a1d77cd9394d3a40b4ff811d0adffc1319f657c..c50bc30df52df00f75ddf6af4cfaf3012bc68f1b

 .abf.yml        |  2 +-
 qt5-qtbase.spec | 78 ++++++++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 5189647..69f4593 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  qtbase-everywhere-src-5.13.0.tar.xz: 68506e1d6a710f657fe9ddf4e8fec55ad845e81b
+  qtbase-everywhere-src-5.13.1.tar.xz: 238b552da6a7fcf40de3eb9b39609b33783bd582
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 16ab3ae..b2e3455 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -5,14 +5,11 @@
 # this makes sure the files dont get marked as docs
 %define _no_default_doc_files 1
 
-# (tpg) optimize it a bit
-%ifarch %{aarch64}
-# Workaround for weird signal/slot problem
+# If we ever switch back to ld.gold as default
+# linker, we need to add -fuse-ld=bfd or -fuse-ld=lld
+# on aarch64 as workaround for a weird signal/slot problem
 # (slots defined as lambdas never called)
-%global optflags %{optflags} -O2 -fuse-ld=bfd
-%else
-%global optflags %{optflags} -O3
-%endif
+%global optflags %{optflags} -Ofast
 
 #% define debug_package %{nil}
 %define beta %{nil}
@@ -81,7 +78,7 @@
 %define qtegldeviceintegration %mklibname qt%{api}egldeviceintegration %{major}
 %define qtegldeviceintegrationd %mklibname qt%{api}egldeviceintegration -d
 
-%bcond_without bootstrap
+%bcond_with bootstrap
 
 %bcond_with directfb
 # Docs require qdoc5 and qt5-tools to build
@@ -94,12 +91,7 @@
 %endif
 %bcond_without gtk
 
-%ifarch %{aarch64}
-# Attempted workaround for signal/slot breakage at runtime
-%bcond_with clang
-%else
 %bcond_without clang
-%endif
 %bcond_without mysql
 
 %define qtmajor %(echo %{version} |cut -d. -f1)
@@ -109,13 +101,13 @@
 
 Summary:	Version 5 of the Qt toolkit
 Name:		qt5-qtbase
-Version:	5.13.0
+Version:	5.13.1
 %if "%{beta}" != ""
 Release:	0.%{beta}.1
 %define qttarballdir qtbase-everywhere-src-%{version}-%{beta}
 Source0:	http://download.qt.io/development_releases/qt/%(echo %{version}|cut -d. -f1-2)/%{version}-%(echo %{beta} |sed -e "s,1$,,")/submodules/%{qttarballdir}.tar.xz
 %else
-Release:	1
+Release:	3
 %define qttarballdir qtbase-everywhere-src-%{version}
 Source0:	http://download.qt.io/official_releases/qt/%(echo %{version}|cut -d. -f1-2)/%{version}/submodules/%{qttarballdir}.tar.xz
 %endif
@@ -157,6 +149,7 @@ BuildRequires:	python >= 3.0
 BuildRequires:	python2
 BuildRequires:	pkgconfig(libpng)
 BuildRequires:	pkgconfig(zlib)
+BuildRequires:	pkgconfig(libsctp)
 # CUPS
 BuildRequires:	cups-devel
 # OpenGL
@@ -164,6 +157,7 @@ BuildRequires:	pkgconfig(gl)
 BuildRequires:	pkgconfig(egl)
 BuildRequires:	pkgconfig(glesv2)
 BuildRequires:	pkgconfig(gbm)
+BuildRequires:	pkgconfig(libdrm)
 # OpenVG
 BuildRequires:	openvg-devel
 # Vulkan
@@ -234,6 +228,8 @@ BuildRequires:	gdb
 BuildRequires:	qdoc5
 BuildRequires:	qt5-qttools
 BuildRequires:	qt5-assistant
+# Platform plugin required for qhelpgenerator startup
+BuildRequires:	%{qtgui}-minimal
 %endif
 # For the Provides: generator
 BuildRequires:	cmake >= 3.11.0-1
@@ -255,6 +251,7 @@ Development files for version 5 if the QtBootstrap library.
 %files -n %{qtbootstrapd}
 %{_qt_libdir}/libQt%{api}Bootstrap.a
 %{_qt_libdir}/libQt%{api}Bootstrap.prl
+%{_libdir}/cmake/Qt%{api}Bootstrap
 
 #----------------------------------------------------------------------------
 
@@ -340,9 +337,11 @@ Development files for version 5 of the QtCore library.
 %{_qt_docdir}/global
 %{_bindir}/moc-qt%{api}
 %{_qt_bindir}/moc
+%{_bindir}/moc
 %{_qt_bindir}/syncqt*
 %{_bindir}/rcc-qt%{api}
 %{_qt_bindir}/rcc
+%{_bindir}/rcc
 %{_qt_includedir}/QtCore
 %{_qt_libdir}/libQt%{api}Core.so
 %{_qt_libdir}/libQt%{api}Core.prl
@@ -384,8 +383,10 @@ Development files for version 5 of the QtDBus library.
 
 %files -n %{qtdbusd}
 %{_qt_bindir}/qdbuscpp2xml
+%{_bindir}/qdbuscpp2xml
 %{_bindir}/qdbuscpp2xml-qt%{api}
 %{_qt_bindir}/qdbusxml2cpp
+%{_bindir}/qdbusxml2cpp
 %{_bindir}/qdbusxml2cpp-qt%{api}
 %{_qt_includedir}/QtDBus
 %{_qt_libdir}/libQt%{api}DBus.so
@@ -427,6 +428,7 @@ Development files for version 5 of the QtEGLDeviceIntegration library.
 %{_qt_libdir}/libQt%{api}EglFSDeviceIntegration.so
 %{_qt_libdir}/libQt%{api}EglFSDeviceIntegration.prl
 %{_qt_includedir}/QtEglFSDeviceIntegration
+%{_libdir}/cmake/Qt%{api}EglFSDeviceIntegration
 
 #----------------------------------------------------------------------------
 
@@ -494,6 +496,7 @@ Development files for version 5 of the QtGui library.
 
 %files -n %{qtguid}
 %{_qt_bindir}/uic
+%{_bindir}/uic
 %{_bindir}/uic-qt%{api}
 %{_qt_includedir}/QtGui
 %{_qt_includedir}/QtPlatformHeaders
@@ -632,6 +635,7 @@ Development files for the X11 output driver for QtGui v5.
 %{_includedir}/qt5/QtXkbCommonSupport
 %{_libdir}/libQt5XkbCommonSupport.a
 %{_libdir}/libQt5XkbCommonSupport.prl
+%{_libdir}/cmake/Qt%{api}XkbCommonSupport
 
 #----------------------------------------------------------------------------
 
@@ -694,6 +698,8 @@ Development files for the EGL fullscreen output driver for QtGui v5.
 %{_libdir}/libQt5KmsSupport.a
 %{_libdir}/libQt5KmsSupport.prl
 %{_libdir}/cmake/Qt%{api}Gui/Qt5Gui_QEglFS*.cmake
+%{_libdir}/cmake/Qt%{api}EglFsKmsSupport
+%{_libdir}/cmake/Qt%{api}KmsSupport
 
 #----------------------------------------------------------------------------
 
@@ -1066,6 +1072,7 @@ Development files for version 5 of the QtXcbQpa library.
 %files -n %{qtxcbqpad}
 %{_qt_libdir}/libQt%{api}XcbQpa.so
 %{_qt_libdir}/libQt%{api}XcbQpa.prl
+%{_libdir}/cmake/Qt%{api}XcbQpa
 
 
 #----------------------------------------------------------------------------
@@ -1160,9 +1167,6 @@ Requires:	pkgconfig(Qt5Location) = %{version}
 Requires:	pkgconfig(Qt5Positioning) = %{version}
 Requires:	pkgconfig(Qt5Sensors) = %{version}
 Requires:	pkgconfig(Qt5Test) = %{version}
-Requires:	pkgconfig(Qt5CLucene) = %{version}
-Requires:	pkgconfig(Qt5Declarative) = %{version}
-Requires:	pkgconfig(Qt5DesignerComponents) = %{version}
 Requires:	pkgconfig(Qt5Designer) = %{version}
 Requires:	pkgconfig(Qt5Help) = %{version}
 Requires:	pkgconfig(Qt5Multimedia) = %{version}
@@ -1170,7 +1174,6 @@ Requires:	pkgconfig(Qt5MultimediaWidgets) = %{version}
 Requires:	pkgconfig(Qt5Nfc) = %{version}
 Requires:	pkgconfig(Qt5Qml) = %{version}
 Requires:	pkgconfig(Qt5Quick) = %{version}
-Requires:	pkgconfig(Qt5QuickParticles) = %{version}
 Requires:	pkgconfig(Qt5QuickTest) = %{version}
 Requires:	pkgconfig(Qt5QuickWidgets) = %{version}
 Requires:	pkgconfig(Qt5Script) = %{version}
@@ -1181,8 +1184,6 @@ Suggests:	pkgconfig(Qt5WaylandCompositor) = %{version}
 %ifnarch %arm
 Requires:	pkgconfig(Qt5WebEngine) = %{version}
 %endif
-Requires:	pkgconfig(Qt5WebKit) = %{version}
-Requires:	pkgconfig(Qt5WebKitWidgets) = %{version}
 Requires:	pkgconfig(Qt5WebChannel) = %{version}
 Requires:	pkgconfig(Qt5WebSockets) = %{version}
 Requires:	pkgconfig(Qt5XmlPatterns) = %{version}
@@ -1211,6 +1212,7 @@ QCH documentation for the Qt toolkit.
 
 %files -n qt5-doc
 %{_qt_docdir}/*.{tags,qch}
+%{_qt_docdir}/config/exampleurl-*.qdocconf
 %endif
 
 #----------------------------------------------------------------------------
@@ -1325,6 +1327,7 @@ Helper library for Qt accessibility support
 %{_libdir}/libQt%{api}AccessibilitySupport.a
 %{_libdir}/libQt%{api}AccessibilitySupport.prl
 %{_libdir}/pkgconfig/Qt5LinuxAccessibilitySupport.pc
+%{_libdir}/cmake/Qt%{api}AccessibilitySupport
 
 #----------------------------------------------------------------------------
 %package -n %{qtedidsupportd}
@@ -1339,6 +1342,7 @@ Helper library for Qt EDID support
 %{_includedir}/qt%{api}/QtEdidSupport
 %{_libdir}/libQt%{api}EdidSupport.a
 %{_libdir}/libQt%{api}EdidSupport.prl
+%{_libdir}/cmake/Qt%{api}EdidSupport
 
 #----------------------------------------------------------------------------
 %package -n %{qtvulkansupportd}
@@ -1354,6 +1358,7 @@ Helper library for Qt Vulkan support
 %{_libdir}/libQt%{api}VulkanSupport.a
 %{_libdir}/libQt%{api}VulkanSupport.prl
 %{_libdir}/qt%{api}/bin/qvkgen
+%{_libdir}/cmake/Qt%{api}VulkanSupport
 
 #----------------------------------------------------------------------------
 %package -n %{qtdevicediscoverysupportd}
@@ -1368,6 +1373,7 @@ Helper library for Qt device discovery
 %{_includedir}/qt%{api}/QtDeviceDiscoverySupport
 %{_libdir}/libQt%{api}DeviceDiscoverySupport.a
 %{_libdir}/libQt%{api}DeviceDiscoverySupport.prl
+%{_libdir}/cmake/Qt%{api}DeviceDiscoverySupport
 
 #----------------------------------------------------------------------------
 %package -n %{qteglsupportd}
@@ -1382,6 +1388,7 @@ Helper library for Qt EGL support
 %{_includedir}/qt%{api}/QtEglSupport
 %{_libdir}/libQt%{api}EglSupport.a
 %{_libdir}/libQt%{api}EglSupport.prl
+%{_libdir}/cmake/Qt%{api}EglSupport
 
 #----------------------------------------------------------------------------
 %package -n %{qteventdispatchersupportd}
@@ -1396,6 +1403,7 @@ Helper library for Qt event dispatcher support
 %{_includedir}/qt%{api}/QtEventDispatcherSupport
 %{_libdir}/libQt%{api}EventDispatcherSupport.a
 %{_libdir}/libQt%{api}EventDispatcherSupport.prl
+%{_libdir}/cmake/Qt%{api}EventDispatcherSupport
 
 #----------------------------------------------------------------------------
 %package -n %{qtfbsupportd}
@@ -1411,6 +1419,7 @@ Helper library for Qt framebuffer support
 %{_libdir}/libQt%{api}FbSupport.a
 %{_libdir}/libQt%{api}FbSupport.prl
 %{_libdir}/cmake/Qt%{api}Gui/Qt%{api}Gui_QLinuxFb*.cmake
+%{_libdir}/cmake/Qt%{api}FbSupport
 
 #----------------------------------------------------------------------------
 %package -n %{qtfontdatabasesupportd}
@@ -1425,6 +1434,7 @@ Helper library for Qt font database support
 %{_includedir}/qt%{api}/QtFontDatabaseSupport
 %{_libdir}/libQt%{api}FontDatabaseSupport.a
 %{_libdir}/libQt%{api}FontDatabaseSupport.prl
+%{_libdir}/cmake/Qt%{api}FontDatabaseSupport
 
 #----------------------------------------------------------------------------
 %package -n %{qtglxsupportd}
@@ -1439,6 +1449,7 @@ Helper library for Qt GLX support
 %{_includedir}/qt%{api}/QtGlxSupport
 %{_libdir}/libQt%{api}GlxSupport.a
 %{_libdir}/libQt%{api}GlxSupport.prl
+%{_libdir}/cmake/Qt%{api}GlxSupport
 
 #----------------------------------------------------------------------------
 %package -n %{qtinputsupportd}
@@ -1453,6 +1464,7 @@ Helper library for Qt input support
 %{_includedir}/qt%{api}/QtInputSupport
 %{_libdir}/libQt%{api}InputSupport.a
 %{_libdir}/libQt%{api}InputSupport.prl
+%{_libdir}/cmake/Qt%{api}InputSupport
 
 #----------------------------------------------------------------------------
 %package -n %{qtlinuxaccessibilitysupportd}
@@ -1467,6 +1479,7 @@ Helper library for Qt Linux accessibility support
 %{_includedir}/qt%{api}/QtLinuxAccessibilitySupport
 %{_libdir}/libQt%{api}LinuxAccessibilitySupport.a
 %{_libdir}/libQt%{api}LinuxAccessibilitySupport.prl
+%{_libdir}/cmake/Qt%{api}LinuxAccessibilitySupport
 
 #----------------------------------------------------------------------------
 %package -n %{qtplatformcompositorsupportd}
@@ -1481,6 +1494,7 @@ Helper library for Qt platform compositor support
 %{_includedir}/qt%{api}/QtPlatformCompositorSupport
 %{_libdir}/libQt%{api}PlatformCompositorSupport.a
 %{_libdir}/libQt%{api}PlatformCompositorSupport.prl
+%{_libdir}/cmake/Qt%{api}PlatformCompositorSupport
 
 #----------------------------------------------------------------------------
 %package -n %{qtservicesupportd}
@@ -1495,6 +1509,7 @@ Helper library for Qt service support
 %{_includedir}/qt%{api}/QtServiceSupport
 %{_libdir}/libQt%{api}ServiceSupport.a
 %{_libdir}/libQt%{api}ServiceSupport.prl
+%{_libdir}/cmake/Qt%{api}ServiceSupport
 
 #----------------------------------------------------------------------------
 %package -n %{qtthemesupportd}
@@ -1509,6 +1524,7 @@ Helper library for Qt theme support
 %{_includedir}/qt%{api}/QtThemeSupport
 %{_libdir}/libQt%{api}ThemeSupport.a
 %{_libdir}/libQt%{api}ThemeSupport.prl
+%{_libdir}/cmake/Qt%{api}ThemeSupport
 
 #----------------------------------------------------------------------------
 
@@ -1522,6 +1538,7 @@ Makefile generation system for Qt 5.
 
 %files -n qmake%{api}
 %{_bindir}/qmake-qt%{api}
+%{_bindir}/qmake
 %{_qt_bindir}/qmake
 %{_qt_prefix}/mkspecs
 
@@ -1537,6 +1554,7 @@ Qt LALR parser generator.
 
 %files -n qlalr%{api}
 %{_qt_bindir}/qlalr
+%{_bindir}/qlalr
 
 #----------------------------------------------------------------------------
 
@@ -1673,8 +1691,9 @@ export PATH="$(pwd)/pybin:$PATH"
 	-system-freetype  \
 	-optimized-qmake \
 	-optimized-tools \
+	-sctp \
 	-ssl \
-	-openssl-runtime \
+	-openssl-linked \
 	-cups \
 	-icu \
 	-inotify \
@@ -1766,8 +1785,20 @@ rm -f %{buildroot}%{_libdir}/libqtlibpng.*
 %if %{with docs}
 make install_qch_docs INSTALL_ROOT=%{buildroot}
 cp doc/*/*.tags %{buildroot}%{_qt_docdir}/
+%else
+rm -f %{buildroot}%{_qt_docdir}/config/exampleurl-*.qdocconf
 %endif
 
+# Those will eventually get installed... By the qt5-qtdeclarative
+# source package.
+# Not sure why they exist in the qtcore sources as well, probably an
+# upstream packaging bug.
+rm -rf	%{buildroot}%{_libdir}/cmake/Qt%{api}PacketProtocol \
+	%{buildroot}%{_libdir}/cmake/Qt%{api}QmlDebug \
+	%{buildroot}%{_libdir}/cmake/Qt%{api}QmlDevTools \
+	%{buildroot}%{_libdir}/cmake/Qt%{api}QuickParticles \
+	%{buildroot}%{_libdir}/cmake/Qt%{api}QuickShapes
+
 # Probably not useful outside of Qt source tree?
 rm -f %{buildroot}%{_qt_bindir}/qtmodule-configtests
 # Let's not ship -devel files for private libraries... At least not until
@@ -1779,8 +1810,9 @@ rm -f %{buildroot}%{_qt_translationsdir}/qtconfig_*.qm
 mkdir -p %{buildroot}%{_bindir}
 for i in qmake moc uic rcc qdbuscpp2xml qdbusxml2cpp; do
     ln -s ../%{_lib}/qt%{api}/bin/$i %{buildroot}%{_bindir}/$i-qt%{api}
+    ln -s ../%{_lib}/qt%{api}/bin/$i %{buildroot}%{_bindir}/$i
 done
-for i in fixqt4headers.pl; do
+for i in fixqt4headers.pl qlalr; do
     ln -s ../%{_lib}/qt%{api}/bin/$i %{buildroot}%{_bindir}/$i
 done