diff --git a/Tools/CMake/libraries/library_recast.cmake b/Tools/CMake/libraries/library_recast.cmake
new file mode 100644
index 000000000..677459606
--- /dev/null
+++ b/Tools/CMake/libraries/library_recast.cmake
@@ -0,0 +1,18 @@
+# Recast library
+project(recast)
+
+# Source
+addPathRec( "${libDir}/recast/DebugUtils/Source" )
+addPathRec( "${libDir}/recast/Recast/Source" )
+addPathRec( "${libDir}/recast/Detour/Source" )
+addPathRec( "${libDir}/recast/DetourCrowd/Source" )
+addPathRec( "${libDir}/recast/DetourTileCache/Source" )
+
+# Additional includes
+include_directories( "${libDir}/recast/DebugUtils/Include" )
+include_directories( "${libDir}/recast/Recast/Include" )
+include_directories( "${libDir}/recast/Detour/Include" )
+include_directories( "${libDir}/recast/DetourTileCache/Include" )
+include_directories( "${libDir}/recast/DetourCrowd/Include" )
+
+addStaticLib()
\ No newline at end of file
diff --git a/Tools/CMake/modules/module_navigation.cmake b/Tools/CMake/modules/module_navigation.cmake
new file mode 100644
index 000000000..57c92ae77
--- /dev/null
+++ b/Tools/CMake/modules/module_navigation.cmake
@@ -0,0 +1,15 @@
+# Navigation module
+
+addRequiredDefinition( "TORQUE_NAVIGATION_ENABLED" )
+addRequiredLibrary( "libraries/library_recast.cmake" )
+
+# files
+addPathRec( "${srcDir}/navigation" )
+
+# include paths
+include_directories( "${libDir}/recast/DebugUtils/Include" )
+include_directories( "${libDir}/recast/Recast/Include" )
+include_directories( "${libDir}/recast/Detour/Include" )
+include_directories( "${libDir}/recast/DetourTileCache/Include" )
+include_directories( "${libDir}/recast/DetourCrowd/Include" )
+
diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake
index 06845ee22..72a876f06 100644
--- a/Tools/CMake/torque3d.cmake
+++ b/Tools/CMake/torque3d.cmake
@@ -21,6 +21,8 @@ option(TORQUE_HIFI "HIFI? support" OFF)
 mark_as_advanced(TORQUE_HIFI)
 option(TORQUE_EXTENDED_MOVE "Extended move support" OFF)
 mark_as_advanced(TORQUE_EXTENDED_MOVE)
+option(TORQUE_NAVIGATION "Enable Navigation module" OFF)
+#mark_as_advanced(TORQUE_NAVIGATION)
 
 ###############################################################################
 # options
@@ -224,6 +226,10 @@ else()
     addPath("${srcDir}/T3D/gameBase/std")
 endif()
 
+if(TORQUE_NAVIGATION)
+   include( "modules/module_navigation.cmake" )
+endif()
+
 ###############################################################################
 # platform specific things
 ###############################################################################