diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2e72fb35..a14f81c9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -285,8 +285,14 @@ MARK_AS_ADVANCED(FORCE FREECAD_LIBPACK_CHECKFILE6X FREECAD_LIBPACK_CHECKFILE7X)
 # -------------------------------- OpenGL --------------------------------
 
 		find_package(OpenGL)
-
-
+                include(FindPackageMessage)
+                if(OPENGL_GLU_FOUND)
+                    find_package_message(OPENGL_GLU
+                        "Found OpenGLU: ${OPENGL_glu_LIBRARY}"
+                        "[${OPENGL_glu_LIBRARY}][${OEPNGL_INCLUDE_DIR}]")
+                else(OPENGL_GLU_FOUND)
+                    message(FATAL_ERROR "The GLU library is required. Make sure it is installed.")
+                endif(OPENGL_GLU_FOUND)
 
 # -------------------------------- Coin3D --------------------------------
 
diff --git a/cMake/FindSpnav.cmake b/cMake/FindSpnav.cmake
index f7d704791..48bb2c921 100644
--- a/cMake/FindSpnav.cmake
+++ b/cMake/FindSpnav.cmake
@@ -1,35 +1,29 @@
+# Find the spnav library and header.
+#
+# Sets the usual variables expected for find_package scripts:
+#
+# SPNAV_INCLUDE_DIR - header location
+# SPNAV_LIBRARIES - library to link against
+# SPNAV_FOUND - true if pugixml was found.
+
 IF(UNIX)
 
-    set(TEST_SPNAV_CMAKE TRUE)
-
-    FIND_PATH(SPNAV_INCLUDE_PATH spnav.h
-    )
+    FIND_PATH(SPNAV_INCLUDE_DIR spnav.h)
 
     FIND_LIBRARY(SPNAV_LIBRARY
         NAMES
         spnav libspnav
     )
 
-    if(SPNAV_INCLUDE_PATH AND SPNAV_LIBRARY)
-        set(SPNAV_FOUND TRUE)
-        set(SPNAV_LIBRARIES ${SPNAV_LIBRARY})
-        set(SPNAV_INCLUDE_DIR ${SPNAV_INCLUDE_PATH})
-    endif(SPNAV_INCLUDE_PATH AND SPNAV_LIBRARY)
+# Support the REQUIRED and QUIET arguments, and set SPNAV_FOUND if found.
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Spnav DEFAULT_MSG SPNAV_LIBRARY
+                                  SPNAV_INCLUDE_DIR)
 
+if(SPNAV_FOUND)
+    set(SPNAV_LIBRARIES ${SPNAV_LIBRARY})
+endif()
 
-
-    if(TEST_SPNAV_CMAKE)
-        if(SPNAV_INCLUDE_PATH)
-            MESSAGE("found spnav include path ${SPNAV_INCLUDE_PATH}")
-        else(SPNAV_INCLUDE_PATH)
-            MESSAGE("didn't find spnav include path")
-        endif(SPNAV_INCLUDE_PATH)
-
-        if(SPNAV_LIBRARY)
-            MESSAGE("found spnav library ${SPNAV_LIBRARY}")
-        else(SPNAV_LIBRARY)
-            MESSAGE("didn't find spnav library")
-        endif(SPNAV_LIBRARY)
-    endif(TEST_SPNAV_CMAKE)
+mark_as_advanced(SPANV_LIBRARY SPNAV_INCLUDE_DIR)
 
 ENDIF(UNIX)