diff --git a/CMakeLists.txt b/CMakeLists.txt
index 059cda055f99b067df0acfb7caf07036780d1af7..6a95e351ad9510dbb7e1ada07e40207caf64afb9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,6 +240,9 @@ endif()
 
 if (ENABLE_SPNAV)
   find_package(SpNav REQUIRED)
+  set(_SPNAV ON)
+else()
+  set(_SPNAV OFF)
 endif()
 
 if (CMAKE_COMPILER_IS_GNUCXX)
@@ -252,7 +255,6 @@ include_directories(${Boost_INCLUDE_DIRS}
                     ${FFTW_INCLUDE_PATH} 
                     ${EIGEN2_INCLUDE_DIR}
                     ${TIFF_INCLUDE_DIR}
-                    ${SPNAV_INCLUDE_DIR}
                     ${PNG_INCLUDE_DIR}
                     )
 if(USE_NUMPY)
@@ -300,6 +302,7 @@ message(STATUS
         "   Image Processing support         (-DENABLE_IMG) : ${_IMG}\n"
         "   Shader support                   (-DUSE_SHADER) : ${_SHADER}\n"
         "   Numpy support                     (-DUSE_NUMPY) : ${_NUMPY}\n"
+        "   SpaceNav Device support        (-DENABLE_SPNAV) : ${_SPNAV}\n"
         "   Optimize                           (-DOPTIMIZE) : ${_OPT}\n"
         "   Profiling support                   (-DPROFILE) : ${_PROFILE}\n"
         "   Double Precision       (-DUSE_DOUBLE_PRECISION) : ${_DOUBLE_PREC}\n"
diff --git a/modules/gui/src/CMakeLists.txt b/modules/gui/src/CMakeLists.txt
index 50c89edb8b7ee2ee3f3ff059e2fc2128ce72ba11..92cba1bfe308ef1c397cfbaa8f2b5473509742e7 100644
--- a/modules/gui/src/CMakeLists.txt
+++ b/modules/gui/src/CMakeLists.txt
@@ -98,6 +98,7 @@ log_reader.hh
 )
 
 if (ENABLE_SPNAV)
+include_directories(${SPNAV_INCLUDE_DIR})
 set(OST_GUI_INPUT_HEADERS
 spnav_input.hh
   IN_DIR input