diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake
index 5b30cd006..5aab2d477 100644
--- a/Modules/FindQt.cmake
+++ b/Modules/FindQt.cmake
@@ -116,10 +116,14 @@ IF(DESIRED_QT_VERSION MATCHES 4)
 ENDIF(DESIRED_QT_VERSION MATCHES 4)
 
 IF(NOT QT3_INSTALLED AND NOT QT4_INSTALLED)
-  MESSAGE(SEND_ERROR "CMake was unable to find any QT versions, put qmake in your path, or set QT_QMAKE_EXECUTABLE.")
+  IF(QT_REQUIRED)
+    MESSAGE(SEND_ERROR "CMake was unable to find any QT versions, put qmake in your path, or set QT_QMAKE_EXECUTABLE.")
+  ENDIF(QT_REQUIRED)
 ELSE(NOT QT3_INSTALLED AND NOT QT4_INSTALLED)
   IF(NOT QT_FOUND AND NOT DESIRED_QT_VERSION)
-    MESSAGE(SEND_ERROR "Multiple versions of QT found please set DESIRED_QT_VERSION")
+    IF(QT_REQUIRED)
+      MESSAGE(SEND_ERROR "Multiple versions of QT found please set DESIRED_QT_VERSION")
+    ENDIF(QT_REQUIRED)
   ENDIF(NOT QT_FOUND AND NOT DESIRED_QT_VERSION)
   IF(NOT QT_FOUND AND DESIRED_QT_VERSION)
     MESSAGE(SEND_ERROR "CMake was unable to find QT version: ${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and QT${DESIRED_QT_VERSION}_QGLOBAL_FILE.")
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 46e294595..8b9daa2d1 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -182,7 +182,6 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args,
     return false;
     }
 
-#ifdef CMAKE_BUILD_WITH_CMAKE
   std::vector<std::string>::const_iterator i = args.begin();
 
   i++; // Get rid of subcommand
@@ -227,11 +226,6 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args,
     }
   m_Makefile->AddDefinition(variable.c_str(), output.c_str());
   return true;
-#else
-  (void)recurse;
-  this->SetError("GLOB is not implemented in the bootstrap CMake");
-  return false;
-#endif
 }
 
 //----------------------------------------------------------------------------
diff --git a/bootstrap b/bootstrap
index 3d398ecea..7e912ff4f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -45,6 +45,7 @@ CMAKE_CXX_SOURCES="\
   cmMakefile \
   cmGeneratedFileStream \
   cmGlobalGenerator \
+  cmGlob \
   cmLocalGenerator \
   cmSourceFile \
   cmSystemTools \