diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 153cc4d9aace2c603af59eeab933ed4c52118f07..d19811586ffce355bc3b2f100e43d4805b77d619 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -7,11 +7,10 @@
 # The "cmake -E touch" command was released with 2.4.8.
 cmake_minimum_required(VERSION 2.4.8 FATAL_ERROR)
 
-# This makes cmake 2.6 not complain about a version
-# 2.4 compatibility mode
-if(COMMAND cmake_policy)
+# This makes cmake 2.6 not complain about version 2.4 compatibility.
+if (COMMAND cmake_policy)
   cmake_policy(SET CMP0003 OLD)
-endif(COMMAND cmake_policy)
+endif (COMMAND cmake_policy)
 
 set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING
     "The root project/makefile/solution name. Defaults to SecondLife.")
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 34b8046a17b1603574d7e74fc681edc3f923d9c4..9ddcc62f2c159ecad2f84e1a7af7708ffeb2ebfe 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -71,6 +71,7 @@ set(cmake_SOURCE_FILES
     Prebuilt.cmake
     QuickTime.cmake
     TemplateCheck.cmake
+    Tut.cmake
     UI.cmake
     UnixInstall.cmake
     Variables.cmake
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 57797a0d122ccaa34161f73ead33fa49b81782a4..5d3081864271fa19869bb58ddbc8d44829748dd4 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -1,3 +1,4 @@
+# -*- cmake -*-
 
 INCLUDE(APR)
 INCLUDE(LLMath)
diff --git a/indra/cmake/Tut.cmake b/indra/cmake/Tut.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..7488e9dcb0b7c02c059faa342e975eb5d7c17ed1
--- /dev/null
+++ b/indra/cmake/Tut.cmake
@@ -0,0 +1,6 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+if (NOT STANDALONE)
+  use_prebuilt_binary(tut)
+endif(NOT STANDALONE)
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 4fb018741233dd032f307c24e517a0adc5767edf..0f3e159802de8e8dd0de5a45d7a4d63c299ef7bb 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -8,6 +8,7 @@ include(LLMath)
 include(LLMessage)
 include(LLVFS)
 include(LLAddBuildTest)
+include(Tut)
 
 include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index b9e0e3dbdde2c018275f079250e425dfca0f75b8..c8682c8ea74340ab600fce1bb289741f22f30692 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -12,6 +12,7 @@ include(LLVFS)
 include(LLXML)
 include(LScript)
 include(Linking)
+include(Tut)
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}