Index: cmake/modules/FindFreetype.cmake
===================================================================
--- cmake/modules/FindFreetype.cmake	(revision 13024)
+++ cmake/modules/FindFreetype.cmake	(working copy)
@@ -7,10 +7,9 @@
 # also defined, but not for general use are
 #  FREETYPE_LIBRARY, where to find the freetype library.
 
-FIND_PATH(FREETYPE_INCLUDE_DIR freetype/config/ftheader.h
-/usr/local/include/freetype2
-/usr/include/freetype2
-)
+FIND_PATH(FREETYPE_INCLUDE_DIR ft2build.h
+  PATH_SUFFIXES freetype2;freetype2/freetype
+  )
 
 SET(FREETYPE_NAMES ${FREETYPE_NAMES} freetype)
 FIND_LIBRARY(FREETYPE_LIBRARY
Index: cmake/modules/FindShapelib.cmake
===================================================================
--- cmake/modules/FindShapelib.cmake	(revision 13024)
+++ cmake/modules/FindShapelib.cmake	(working copy)
@@ -9,10 +9,9 @@
 #  SHAPELIB_LIBRARY_DIRS, the directory where the shapelib library is found.
 
 find_path(SHAPELIB_INCLUDE_DIR shapefil.h /usr/local/include /usr/include)
-
 if(SHAPELIB_INCLUDE_DIR)
   find_library(SHAPELIB_LIBRARY
-  NAMES shp
+  NAMES shp;shapelib
   PATHS /usr/local/lib /usr/lib
   )
   if(SHAPELIB_LIBRARY)