--- CMakeModules/FindQwtQt4.orig.cmake	2015-06-17 07:55:18.000000000 +0200
+++ CMakeModules/FindQwtQt4.cmake	2015-06-22 11:34:42.750303512 +0200
@@ -11,36 +11,18 @@
 #  QWT_LIBRARY - Link these to use qwt
 
 find_path(QWT_INCLUDE_DIR qwt.h
-    PATHS $ENV{QWT_DIR}/include
-          $ENV{QWT_DIR}
-          ~/Library/Frameworks
-          /Library/Frameworks
-          /sw/include        # Fink
-          /opt/local/include # MacPorts
-          /opt/csw/include   # Blastwave
-          /opt/include
-          /usr/freeware/include
-    PATH_SUFFIXES qwt qwt-qt4
+    PATHS /usr/include
+    PATH_SUFFIXES qwt5-qt4 qwt
     NO_DEFAULT_PATH)
 
 if (NOT QWT_INCLUDE_DIR)
     find_path(QWT_INCLUDE_DIR qwt.h
-        PATH_SUFFIXES qwt qwt-qt4)
+        PATH_SUFFIXES qwt5-qt4 qwt)
 endif ()
 
 find_library(QWT_LIBRARY
-    NAMES qwt-static
-          qwt-qt4
-          qwt
-    PATHS $ENV{QWT_DIR}/lib
-          $ENV{QWT_DIR}
-          ~/Library/Frameworks
-          /Library/Frameworks
-          /sw/lib        # Fink
-          /opt/local/lib # MacPorts
-          /opt/csw/lib   # Blastwave
-          /opt/lib
-          /usr/freeware/lib64
+    NAMES qwt5-qt4 qwt
+    PATHS @@libdir@@
     NO_DEFAULT_PATH)
 
 if (NOT QWT_LIBRARY)
--- CMakeModules/FindQtMmlQt4.orig.cmake	2015-06-17 07:55:18.000000000 +0200
+++ CMakeModules/FindQtMmlQt4.cmake	2015-06-22 20:53:18.388194667 +0200
@@ -20,6 +20,7 @@
           /opt/csw/include   # Blastwave
           /opt/include
           /usr/freeware/include
+          @@_kde4_includedir@@
     NO_DEFAULT_PATH)
 
 if (NOT MML_INCLUDE_DIR)
@@ -29,7 +30,8 @@
 find_library(MML_LIBRARY
     NAMES mml-static 
           mml 
-          QtSolutions_MMLWidget-2.4
+          QtSolutions_MMLWidget-2.4 
+          qtmmlwidget
     PATHS $ENV{MML_DIR}/lib
           $ENV{MML_DIR}
           ~/Library/Frameworks
@@ -39,13 +41,15 @@
           /opt/csw/lib   # Blastwave
           /opt/lib
           /usr/freeware/lib64
+          @@_kde4_libdir@@
      NO_DEFAULT_PATH)
 
 if (NOT MML_LIBRARY)
 find_library(MML_LIBRARY
     NAMES mml-static 
           mml 
-          QtSolutions_MMLWidget-2.4)
+          QtSolutions_MMLWidget-2.4 
+          qtmmlwidget)
 endif()
 
 if (NOT MML_INCLUDE_DIR)
--- CMakeModules/FindSBW.orig.cmake	2015-06-17 07:55:18.000000000 +0200
+++ CMakeModules/FindSBW.cmake	2015-06-22 21:46:45.681316360 +0200
@@ -27,11 +27,11 @@
 endif ()
 
 find_library(SBW_LIBRARIES
-    NAMES SBW-static
-          SBW
-          sbw 
-          libSBW 
+    NAMES SBW
           libsbw
+          SBW-static
+          SBW
+          sbw
     PATHS $ENV{SBW_DIR}/lib
           $ENV{SBW_DIR}
           ~/Library/Frameworks