diff --git a/cmake-ImageMagick7.patch b/cmake-ImageMagick7.patch
new file mode 100644
index 0000000..6f193b0
--- /dev/null
+++ b/cmake-ImageMagick7.patch
@@ -0,0 +1,43 @@
+Index: cmake-3.7.2/Modules/FindImageMagick.cmake
+===================================================================
+--- cmake-3.7.2.orig/Modules/FindImageMagick.cmake	2017-01-13 15:05:41.000000000 +0100
++++ cmake-3.7.2/Modules/FindImageMagick.cmake	2017-03-28 11:00:23.197144625 +0200
+@@ -88,13 +88,13 @@ find_package(PkgConfig QUIET)
+ #---------------------------------------------------------------------
+ # Helper functions
+ #---------------------------------------------------------------------
+-function(FIND_IMAGEMAGICK_API component header)
++function(FIND_IMAGEMAGICK_API component header6 header7)
+   set(ImageMagick_${component}_FOUND FALSE PARENT_SCOPE)
+ 
+   pkg_check_modules(PC_${component} QUIET ${component})
+ 
+   find_path(ImageMagick_${component}_INCLUDE_DIR
+-    NAMES ${header}
++    NAMES ${header6} ${header7}
+     HINTS
+       ${PC_${component}_INCLUDEDIR}
+       ${PC_${component}_INCLUDE_DIRS}
+@@ -195,17 +195,17 @@ foreach(component ${ImageMagick_FIND_COM
+     )
+   if(component STREQUAL "Magick++")
+     FIND_IMAGEMAGICK_API(Magick++ Magick++.h
+-      Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
++      Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-7.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-7.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-7.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-7.Q8HDRI Magick++-Q8HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
+   elseif(component STREQUAL "MagickWand")
+-    FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
+-      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
++    FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h MagickWand/MagickWand.h
++      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-7.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-7.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-7.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-7.Q8HDRI MagickWand-Q8HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
+   elseif(component STREQUAL "MagickCore")
+-    FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
+-      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
++    FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h MagickCore/MagickCore.h
++      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-7.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-7.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-7.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-7.Q8HDRI MagickCore-Q8HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
+   else()
diff --git a/cmake.changes b/cmake.changes
index 5f658cb..b5dfc31 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 28 09:14:23 UTC 2017 - pgajdos@suse.com
+
+- find ImageMagick 7
+  + cmake-ImageMagick7.patch
+
 -------------------------------------------------------------------
 Sun Jan 15 14:11:33 UTC 2017 - astieger@suse.com
 
diff --git a/cmake.spec b/cmake.spec
index b870e3c..65160ec 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -36,6 +36,8 @@ Patch2:         cmake-fix-ruby-test.patch
 Patch4:         form.patch
 # PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs
 Patch5:         system-libs.patch
+# PATCH-FIX-UPSTREAM cmake-ImageMagick7.patch -- find also ImageMagick 7
+Patch6:         cmake-ImageMagick7.patch
 BuildRequires:  curl-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -75,6 +77,7 @@ echo "`grep %{name}-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'`  %{SOU
 %patch2 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 export CFLAGS="%{optflags}"