diff --git a/Fix-bug-when-highlighting-selected-notes.patch b/Fix-bug-when-highlighting-selected-notes.patch
new file mode 100644
index 0000000..c9ca739
--- /dev/null
+++ b/Fix-bug-when-highlighting-selected-notes.patch
@@ -0,0 +1,34 @@
+From 3bf2f5e93d078e8215c47a4b4e3f7e240b943060 Mon Sep 17 00:00:00 2001
+From: "Sandro S. Andrade" <sandroandrade@kde.org>
+Date: Sun, 30 Sep 2018 12:13:10 -0300
+Subject: Fix bug when highlighting selected notes
+
+---
+ src/app/qml/PianoView/PianoView.qml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/app/qml/PianoView/PianoView.qml b/src/app/qml/PianoView/PianoView.qml
+index 90b3218..da3a78b 100644
+--- a/src/app/qml/PianoView/PianoView.qml
++++ b/src/app/qml/PianoView/PianoView.qml
+@@ -45,7 +45,7 @@ Flickable {
+         highlightKey(pitch, ([1,3,6,8,10].indexOf(pitch % 12) > -1) ? "black":"white")
+     }
+     function noteMark(chan, pitch, vel, color) {
+-        noteMark.createObject(itemForPitch(pitch), { color: color })
++        noteMarkComponent.createObject(itemForPitch(pitch), { color: color })
+     }
+     function noteUnmark(chan, pitch, vel, color) {
+         if(itemForPitch(pitch)!= undefined){
+@@ -133,7 +133,7 @@ Flickable {
+         }
+ 
+         Component {
+-            id: noteMark
++            id: noteMarkComponent
+ 
+             Rectangle {
+                 width: keyWidth - 4; height: keyWidth - 4
+-- 
+cgit v0.11.2
+
diff --git a/minuet.changes b/minuet.changes
index db40028..3cd7632 100644
--- a/minuet.changes
+++ b/minuet.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 10 15:56:28 UTC 2018 - wbauer@tmo.at
+
+- Add Fix-bug-when-highlighting-selected-notes.patch to fix broken
+  note display in piano view with current Qt versions
+- Update build requirements
+
 -------------------------------------------------------------------
 Thu Sep 06 18:43:13 UTC 2018 - lbeltrame@kde.org
 
diff --git a/minuet.spec b/minuet.spec
index ef4c26b..f028c11 100644
--- a/minuet.spec
+++ b/minuet.spec
@@ -29,23 +29,22 @@ License:        GPL-2.0-or-later
 Group:          Productivity/Other
 Url:            http://www.kde.org
 Source:         minuet-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM
+Patch:          Fix-bug-when-highlighting-selected-notes.patch
 BuildRequires:  extra-cmake-modules >= 5.15.0
 BuildRequires:  kf5-filesystem
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
-BuildRequires:  cmake(KF5Completion)
 BuildRequires:  cmake(KF5CoreAddons)
 BuildRequires:  cmake(KF5Crash)
 BuildRequires:  cmake(KF5DocTools)
 BuildRequires:  cmake(KF5I18n)
-BuildRequires:  cmake(KF5KIO)
-BuildRequires:  cmake(KF5WidgetsAddons)
-BuildRequires:  cmake(KF5XmlGui)
 BuildRequires:  cmake(Qt5Core) >= 5.7.0
+BuildRequires:  cmake(Qt5Gui) >= 5.7.0
+BuildRequires:  cmake(Qt5Qml) >= 5.7.0
 BuildRequires:  cmake(Qt5Quick) >= 5.7.0
 BuildRequires:  cmake(Qt5QuickControls2) >= 5.7.0
 BuildRequires:  cmake(Qt5Svg) >= 5.7.0
-BuildRequires:  cmake(Qt5Widgets) >= 5.7.0
 BuildRequires:  pkgconfig(fluidsynth)
 # Runtime requirement
 Requires:       libqt5-qtquickcontrols2
@@ -74,6 +73,7 @@ Development headers and libraries for Minuet.
 
 %prep
 %setup -q
+%patch -p1
 
 %build
   %cmake_kf5 -d build