diff --git a/digikam.changes b/digikam.changes
index ac998b9..19b837c 100644
--- a/digikam.changes
+++ b/digikam.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec  8 19:48:19 UTC 2017 - wbauer@tmo.at
+
+- Add fix-Qt-5.9.3-empty-album-problem.patch to fix albums showing
+  up empty with Qt 5.9.3 or higher (kde#387373)
+
 -------------------------------------------------------------------
 Wed Nov 22 11:51:13 UTC 2017 - wbauer@tmo.at
 
diff --git a/digikam.spec b/digikam.spec
index 615acd9..466794c 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -28,6 +28,8 @@ Source0:        http://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
 Patch0:         0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch
 # PATCH-FIX-UPSTREAM
 Patch1:         Adapt-to-KCalCore-API-changes.patch
+# PATCH-FIX-UPSTREAM
+Patch2:         fix-Qt-5.9.3-empty-album-problem.patch
 #This pulls in QWebEngine, which is not available on ppc64
 %ifarch %ix86 x86_64 %arm aarch64 mips mips64
 BuildRequires:  akonadi-contact-devel
@@ -172,6 +174,7 @@ The main digikam libraries that are being shared between showfoto and digikam
 %patch0 -p1
 %endif
 %patch1 -p1
+%patch2 -p1
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
diff --git a/fix-Qt-5.9.3-empty-album-problem.patch b/fix-Qt-5.9.3-empty-album-problem.patch
new file mode 100644
index 0000000..afafc16
--- /dev/null
+++ b/fix-Qt-5.9.3-empty-album-problem.patch
@@ -0,0 +1,31 @@
+From 855ba5b7d4bc6337234720a72ea824ddd3b32e5b Mon Sep 17 00:00:00 2001
+From: Maik Qualmann <metzpinguin@gmail.com>
+Date: Tue, 28 Nov 2017 21:29:00 +0100
+Subject: try to fix the Qt-5.9.3 empty album problem CCBUGS: 387373
+
+---
+ core/libs/database/coredb/coredburl.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/core/libs/database/coredb/coredburl.cpp b/core/libs/database/coredb/coredburl.cpp
+index 2c0d0eb..b1bdf71 100644
+--- a/core/libs/database/coredb/coredburl.cpp
++++ b/core/libs/database/coredb/coredburl.cpp
+@@ -88,8 +88,13 @@ CoreDbUrl CoreDbUrl::fromAlbumAndName(const QString& name,
+                                       const DbEngineParameters& parameters)
+ {
+     CoreDbUrl url;
++    QString path(album);
+     url.setScheme(QLatin1String("digikamalbums"));
+-    url.setPath(QLatin1Char('/') + album + QLatin1Char('/') + name);
++
++    if (path != QLatin1String("/"))
++        path += QLatin1Char('/');
++
++    url.setPath(path + name);
+ 
+     QUrlQuery q(url);
+     q.addQueryItem(QLatin1String("albumRoot"),   albumRoot.adjusted(QUrl::StripTrailingSlash).toLocalFile());
+-- 
+cgit v0.11.2
+