diff --git a/bootstrap b/bootstrap
index 9614793f16c82088675aac780b4b2e0af958acdd..377e6ed0f3a2c7c03267375c3f8ddeef8a1360ed 100755
--- a/bootstrap
+++ b/bootstrap
@@ -877,6 +877,10 @@ for a in ${CMAKE_CXX_SOURCES} ${CMAKE_C_SOURCES} ${KWSYS_CXX_SOURCES} ${KWSYS_C_
   objs="${objs} ${a}.o"
 done
 
+# Generate dependencies for cmBootstrapCommands.cxx
+cmBootstrapCommandsDeps=`grep "#include.*cm[^.]*.cxx" ${cmake_source_dir}/Source/cmBootstrapCommands.cxx | sed "s/.* \"\(.*\)\"/\1/" | awk "{ print \"${cmake_source_dir}/Source/\" \\$1}"`
+cmBootstrapCommandsDeps=`echo $cmBootstrapCommandsDeps`
+
 if [ "x${cmake_ansi_cxx_flags}" != "x" ]; then
   cmake_cxx_flags="${cmake_ansi_cxx_flags} ${cmake_cxx_flags}"
 fi
@@ -900,6 +904,7 @@ for a in ${CMAKE_CXX_SOURCES}; do
   echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile"
   echo "	${cmake_cxx_compiler} ${cmake_cxx_flags} -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile"
 done
+echo "cmBootstrapCommands.o: $cmBootstrapCommandsDeps" >> "${cmake_bootstrap_dir}/Makefile"
 for a in ${CMAKE_C_SOURCES}; do
   src=`cmake_escape "${cmake_source_dir}/Source/${a}.c"`
   echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile"