Index: cmake/FindQwtPolar.cmake
===================================================================
--- cmake/FindQwtPolar.cmake	(revision 15214)
+++ cmake/FindQwtPolar.cmake	(working copy)
@@ -13,13 +13,13 @@
 #
 
 
-#MESSAGE("Searching for QWTPolar")
+#MESSAGE("Searching for QwtPolar")
 FIND_PATH(QWTPOLAR_INCLUDE_DIR NAMES qwt_polar.h PATHS
   /usr/include
   /usr/local/include
   "$ENV{LIB_DIR}/include" 
   "$ENV{INCLUDE}" 
-  PATH_SUFFIXES qwt-qt4 qwt qwt5
+  PATH_SUFFIXES qwtpolar
   )
 
 FIND_LIBRARY(QWTPOLAR_LIBRARY NAMES qwtpolar PATHS 
@@ -35,10 +35,10 @@
 
 IF (QWTPOLAR_FOUND)
   IF (NOT QWTPOLAR_FIND_QUIETLY)
-    MESSAGE(STATUS "Found QWTPolar: ${QWTPOLAR_LIBRARY}")
+    MESSAGE(STATUS "Found QwtPolar: ${QWTPOLAR_LIBRARY}")
   ENDIF (NOT QWTPOLAR_FIND_QUIETLY)
 ELSE (QWTPOLAR_FOUND)
   IF (QWTPOLAR_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could not find QWTPolar")
+    MESSAGE(FATAL_ERROR "Could not find QwtPolar")
   ENDIF (QWTPOLAR_FIND_REQUIRED)
 ENDIF (QWTPOLAR_FOUND)
Index: cmake/FindQwt.cmake
===================================================================
--- cmake/FindQwt.cmake	(revision 15214)
+++ cmake/FindQwt.cmake	(working copy)
@@ -12,7 +12,7 @@
 #
 
 
-#MESSAGE("Searching for QWT")
+#MESSAGE("Searching for Qwt")
 FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS
   /usr/include
   /usr/local/include
@@ -34,10 +34,10 @@
 
 IF (QWT_FOUND)
   IF (NOT QWT_FIND_QUIETLY)
-    MESSAGE(STATUS "Found QWT: ${QWT_LIBRARY}")
+    MESSAGE(STATUS "Found Qwt: ${QWT_LIBRARY}")
   ENDIF (NOT QWT_FIND_QUIETLY)
 ELSE (QWT_FOUND)
   IF (QWT_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could not find QWT")
+    MESSAGE(FATAL_ERROR "Could not find Qwt")
   ENDIF (QWT_FIND_REQUIRED)
 ENDIF (QWT_FOUND)
Index: cmake/FindQWT.cmake
===================================================================
--- cmake/FindQWT.cmake	(revision 15214)
+++ cmake/FindQWT.cmake	(working copy)
@@ -1,43 +0,0 @@
-# Find Qwt
-# ~~~~~~~~
-# Copyright (c) 2010, Tim Sutton <tim at linfiniti.com>
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-# Once run this will define: 
-# 
-# QWT_FOUND       = system has QWT lib
-# QWT_LIBRARY     = full path to the QWT library
-# QWT_INCLUDE_DIR = where to find headers 
-#
-
-
-#MESSAGE("Searching for QWT")
-FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS
-  /usr/include
-  /usr/local/include
-  "$ENV{LIB_DIR}/include" 
-  "$ENV{INCLUDE}" 
-  PATH_SUFFIXES qwt-qt4 qwt qwt5
-  )
-
-FIND_LIBRARY(QWT_LIBRARY NAMES qwt qwt5 qwt-qt4 qwt5-qt4 PATHS 
-  /usr/lib
-  /usr/local/lib
-  "$ENV{LIB_DIR}/lib" 
-  "$ENV{LIB}/lib" 
-  )
-
-IF (QWT_INCLUDE_DIR AND QWT_LIBRARY)
-  SET(QWT_FOUND TRUE)
-ENDIF (QWT_INCLUDE_DIR AND QWT_LIBRARY)
-
-IF (QWT_FOUND)
-  IF (NOT QWT_FIND_QUIETLY)
-    MESSAGE(STATUS "Found QWT: ${QWT_LIBRARY}")
-  ENDIF (NOT QWT_FIND_QUIETLY)
-ELSE (QWT_FOUND)
-  IF (QWT_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could not find QWT")
-  ENDIF (QWT_FIND_REQUIRED)
-ENDIF (QWT_FOUND)
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 15214)
+++ CMakeLists.txt	(working copy)
@@ -142,9 +142,9 @@
 FIND_PACKAGE(GSL)      # Georeferencer
 FIND_PACKAGE(GEOS)
 FIND_PACKAGE(GDAL)
-FIND_PACKAGE(QWT REQUIRED)
+FIND_PACKAGE(Qwt REQUIRED)
 IF (NOT WITH_INTERNAL_QWTPOLAR)
-  FIND_PACKAGE(QWTPOLAR REQUIRED)
+  FIND_PACKAGE(QwtPolar REQUIRED)
 ENDIF(NOT WITH_INTERNAL_QWTPOLAR)
 
 IF (NOT WITH_INTERNAL_SPATIALITE)