diff --git a/gpgme.changes b/gpgme.changes
index f9b19a5..e94e708 100644
--- a/gpgme.changes
+++ b/gpgme.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 22 23:19:10 UTC 2016 - lbeltrame@kde.org
+
+- Add remove-a-forgotten-instance-of-libsuffix.diff: fix CMake 
+  files for gpgmepp (or they won't work with KDE software) 
+
 -------------------------------------------------------------------
 Sat Nov 19 21:51:22 UTC 2016 - astieger@suse.com
 
diff --git a/gpgme.spec b/gpgme.spec
index f6bd9ac..6df8b39 100644
--- a/gpgme.spec
+++ b/gpgme.spec
@@ -33,6 +33,8 @@ Source2:        baselibs.conf
 Source3:        gpgme.keyring
 # used to have a fixed timestamp
 Source99:       %{name}.changes
+#PATCH-FIX-UPSTREAM: remove-a-forgotten-instance-of-libsuffix.diff - Fix cmake files (or it will break KDE software building)
+Patch1:         remove-a-forgotten-instance-of-libsuffix.diff
 BuildRequires:  gpg2 >= 2.0.10
 BuildRequires:  libassuan-devel >= 2.0.2
 BuildRequires:  libgpg-error-devel >= 1.17
@@ -187,6 +189,7 @@ This package contains the bindings to use the library in Qt C++ applications.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 build_timestamp=$(date -u +%{Y}-%{m}-%{dT}%{H}:%{M}+0000 -r %{SOURCE99})
diff --git a/remove-a-forgotten-instance-of-libsuffix.diff b/remove-a-forgotten-instance-of-libsuffix.diff
new file mode 100644
index 0000000..dad3b52
--- /dev/null
+++ b/remove-a-forgotten-instance-of-libsuffix.diff
@@ -0,0 +1,33 @@
+From 572c1aac107125ce62230251713349348373db5a Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Wed, 16 Nov 2016 23:09:45 +0100
+Subject: [PATCH] Remove a forgotten instance of @libsuffix@
+
+* lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove a forgotten
+instance of @libsuffix@.
+--
+
+b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from
+cmake config files, but missed one instance.
+
+Signed-off-by: Heiko Becker <heirecka@exherbo.org>
+---
+ lang/cpp/src/GpgmeppConfig.cmake.in.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
+index 928d19f..cbe9713 100644
+--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
++++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
+@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED)
+ 
+ set_target_properties(Gpgmepp PROPERTIES
+   INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
+-  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
++  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
+   IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so"
+ )
+ 
+-- 
+2.8.0.rc3
+