diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc311484d87..7e92d664653 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -716,7 +716,7 @@ SUMMARY_ADD("Learning Server" "Embodiment Learning" HAVE_MOSES)
 SUMMARY_ADD("GTK Visualizer" "GTK3-based Atomspace Visualizer" HAVE_GTK)
 SUMMARY_ADD("Python tests" "Python bindings nose tests" HAVE_NOSETESTS)
 SUMMARY_ADD("Server" "The CogServer" HAVE_SERVER)
-SUMMARY_ADD("Spatial" "Vizualisation of the 3D spacemap" HAVE_SPATIAL_TOOLS)
+SUMMARY_ADD("Spatial" "Vizualisation of the 3D spacemap" HAVE_SPATIAL_TOOLS AND HAVE_OCTOMAP)
 SUMMARY_ADD("TBB" "Intel TBB for multithreading" HAVE_TBB)
 SUMMARY_ADD("Ubigraph" "Visualisation of the AtomSpace" HAVE_UBIGRAPH)
 SUMMARY_ADD("Unit tests" "Unit tests" CXXTEST_FOUND)
diff --git a/opencog/CMakeLists.txt b/opencog/CMakeLists.txt
index f4e09a23d1b..25f07528fe7 100644
--- a/opencog/CMakeLists.txt
+++ b/opencog/CMakeLists.txt
@@ -30,8 +30,12 @@ IF (HAVE_CYTHON)
 ENDIF (HAVE_CYTHON)
 
 IF (HAVE_SERVER)
+    #Octomap checking will be done inside
+    #Will always build types
     ADD_SUBDIRECTORY (spacetime)
-    ADD_SUBDIRECTORY (spatial)
+    IF (HAVE_OCTOMAP)
+        ADD_SUBDIRECTORY (spatial)
+    ENDIF (HAVE_OCTOMAP)
 ENDIF (HAVE_SERVER)
 
 # build unconditionally; a check is made there.
diff --git a/opencog/cython/opencog/CMakeLists.txt b/opencog/cython/opencog/CMakeLists.txt
index e4dc0b004c0..ec3b137e849 100644
--- a/opencog/cython/opencog/CMakeLists.txt
+++ b/opencog/cython/opencog/CMakeLists.txt
@@ -74,56 +74,58 @@ IF (HAVE_ATOMSPACE)
 
 	INSTALL (TARGETS cogserver_type_constructors
 		DESTINATION "${DATADIR}/python/opencog")
+    IF (HAVE_OCTOMAP)
         ############################ spacetime #########################
-	#"../../spacetime/SpaceServer.h" "../../spacetime/TimeServer.h"
-	CYTHON_ADD_MODULE_PYX(spacetime
-	  "${ATOMSPACE_INCLUDE_DIR}/opencog/cython/opencog/atomspace.pxd"
-	  )
-	list(APPEND ADDITIONAL_MAKE_CLEAN_FILES "spacetime.cpp")
-	ADD_LIBRARY(spacetime_cython SHARED
-	  spacetime.cpp
-	  )
-
-    TARGET_LINK_LIBRARIES(spacetime_cython
-	      SpaceMap
-		  spacetime
-		  ${ATOMSPACE_LIBRARIES}
-		  ${COGUTIL_LIBRARY}
-		  ${PYTHON_LIBRARIES}
-		  )
-
-		SET_TARGET_PROPERTIES(spacetime_cython PROPERTIES
-		  PREFIX ""
-		  OUTPUT_NAME spacetime)
-
-		INSTALL (TARGETS spacetime_cython
-		  DESTINATION "${DATADIR}/python/opencog")
-
-    ############################ spatial #########################
-	CYTHON_ADD_MODULE_PYX(spatial
-	  "${ATOMSPACE_INCLUDE_DIR}/opencog/cython/opencog/atomspace.pxd"
-	  "../../spacetime/SpaceServer.h" "../../spacetime/TimeServer.h"
-	  )
-	list(APPEND ADDITIONAL_MAKE_CLEAN_FILES "spatial.cpp")
-	ADD_LIBRARY(spatial_cython SHARED
-	  spatial.cpp
-	  )
-
-    TARGET_LINK_LIBRARIES(spatial_cython
-                  SpaceMap
-                  SpaceMapUtil
-		  spacetime
-		  ${ATOMSPACE_LIBRARIES}
-		  ${COGUTIL_LIBRARY}
-		  ${PYTHON_LIBRARIES}
-		  )
-
-		SET_TARGET_PROPERTIES(spatial_cython PROPERTIES
-		  PREFIX ""
-		  OUTPUT_NAME spatial)
-
-		INSTALL (TARGETS spatial_cython
-		  DESTINATION "${DATADIR}/python/opencog")
+        #"../../spacetime/SpaceServer.h" "../../spacetime/TimeServer.h"
+        CYTHON_ADD_MODULE_PYX(spacetime
+            "${ATOMSPACE_INCLUDE_DIR}/opencog/cython/opencog/atomspace.pxd"
+        )
+        list(APPEND ADDITIONAL_MAKE_CLEAN_FILES "spacetime.cpp")
+        ADD_LIBRARY(spacetime_cython SHARED
+            spacetime.cpp
+        )
+
+        TARGET_LINK_LIBRARIES(spacetime_cython
+            SpaceMap
+            spacetime
+            ${ATOMSPACE_LIBRARIES}
+            ${COGUTIL_LIBRARY}
+            ${PYTHON_LIBRARIES}
+        )
+
+        SET_TARGET_PROPERTIES(spacetime_cython PROPERTIES
+            PREFIX ""
+            OUTPUT_NAME spacetime)
+
+        INSTALL (TARGETS spacetime_cython
+            DESTINATION "${DATADIR}/python/opencog")
+
+        ############################ spatial #########################
+        CYTHON_ADD_MODULE_PYX(spatial
+            "${ATOMSPACE_INCLUDE_DIR}/opencog/cython/opencog/atomspace.pxd"
+            "../../spacetime/SpaceServer.h" "../../spacetime/TimeServer.h"
+        )
+        list(APPEND ADDITIONAL_MAKE_CLEAN_FILES "spatial.cpp")
+        ADD_LIBRARY(spatial_cython SHARED
+            spatial.cpp
+        )
+
+        TARGET_LINK_LIBRARIES(spatial_cython
+            SpaceMap
+            SpaceMapUtil
+            spacetime
+            ${ATOMSPACE_LIBRARIES}
+            ${COGUTIL_LIBRARY}
+            ${PYTHON_LIBRARIES}
+        )
+
+        SET_TARGET_PROPERTIES(spatial_cython PROPERTIES
+            PREFIX ""
+            OUTPUT_NAME spatial)
+
+        INSTALL (TARGETS spatial_cython
+            DESTINATION "${DATADIR}/python/opencog")
+    ENDIF (HAVE_OCTOMAP)
 ENDIF (HAVE_ATOMSPACE)
 
 	
diff --git a/opencog/spacetime/CMakeLists.txt b/opencog/spacetime/CMakeLists.txt
index 14dc7d26abc..757b37a1e9f 100644
--- a/opencog/spacetime/CMakeLists.txt
+++ b/opencog/spacetime/CMakeLists.txt
@@ -17,43 +17,48 @@ TARGET_LINK_LIBRARIES(spacetime-types
 ADD_DEPENDENCIES(spacetime-types opencog_atom_types)
 ADD_DEPENDENCIES(spacetime-types spacetime_atom_types)
 
-ADD_LIBRARY (spacetime SHARED
-	HandleToTemporalEntryMap.cc
-	HandleTemporalPairEntry.cc
-	HandleTemporalPair.cc
-	SpaceServer.cc
-	SpaceTime.cc
-	Temporal.cc
-	TemporalEntry.cc
-	TemporalMap.cc
-	TemporalTable.cc
-	TemporalToHandleSetMap.cc
-	TimeServer.cc
-)
+INSTALL (TARGETS spacetime-types
+	LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog/modules")
 
-TARGET_LINK_LIBRARIES(spacetime spacetime-types SpaceMap server
-	${ATOMSPACE_LIBRARIES})
-
-INSTALL (FILES
-	HandleToTemporalEntryMap.h
-	HandleTemporalPairEntry.h
-	HandleTemporalPair.h
-	SpaceServer.h
-	SpaceTime.h
-	SpaceServerContainer.h
-	Temporal.h
-	TemporalEntry.h
-	TemporalMap.h
-	TemporalTable.h
-	TemporalToHandleSetMap.h
-	TimeServer.h
-	DESTINATION "include/${PROJECT_NAME}/spacetime"
-)
+IF (HAVE_OCTOMAP)
+    ADD_LIBRARY (spacetime SHARED
+        HandleToTemporalEntryMap.cc
+        HandleTemporalPairEntry.cc
+        HandleTemporalPair.cc
+        SpaceServer.cc
+        SpaceTime.cc
+        Temporal.cc
+        TemporalEntry.cc
+        TemporalMap.cc
+        TemporalTable.cc
+        TemporalToHandleSetMap.cc
+        TimeServer.cc
+    )
 
-INSTALL (FILES
-	${CMAKE_CURRENT_BINARY_DIR}/spacetime_types.scm
-	DESTINATION "${DATADIR}/scm/spacetime"
-)
+    TARGET_LINK_LIBRARIES(spacetime
+        spacetime-types
+        SpaceMap
+        server
+        ${ATOMSPACE_LIBRARIES})
 
-INSTALL (TARGETS spacetime-types
-	LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}/opencog")
+    INSTALL (FILES
+        HandleToTemporalEntryMap.h
+        HandleTemporalPairEntry.h
+        HandleTemporalPair.h
+        SpaceServer.h
+        SpaceTime.h
+        SpaceServerContainer.h
+        Temporal.h
+        TemporalEntry.h
+        TemporalMap.h
+        TemporalTable.h
+        TemporalToHandleSetMap.h
+        TimeServer.h
+        DESTINATION "include/${PROJECT_NAME}/spacetime"
+    )
+
+    INSTALL (FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/spacetime_types.scm
+        DESTINATION "${DATADIR}/scm/spacetime"
+    )
+ENDIF (HAVE_OCTOMAP)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0c7e841e3df..8b196411a6d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -25,8 +25,10 @@ IF (CXXTEST_FOUND)
 		IF (HAVE_SERVER)
 			ADD_SUBDIRECTORY (server)
 		ENDIF (HAVE_SERVER)
-		ADD_SUBDIRECTORY (spacetime)
- 		ADD_SUBDIRECTORY (spatial)
+        IF (HAVE_OCTOMAP)
+            ADD_SUBDIRECTORY (spacetime)
+            ADD_SUBDIRECTORY (spatial)
+        ENDIF (HAVE_OCTOMAP)
 
 		ADD_SUBDIRECTORY (nlp)