diff --git a/xo-cmake/bin/scaffold-subdir b/xo-cmake/bin/scaffold-subdir
index 4cfe54a6..ab3a6b95 100755
--- a/xo-cmake/bin/scaffold-subdir
+++ b/xo-cmake/bin/scaffold-subdir
@@ -177,42 +177,8 @@ xo_export_cmake_config(\${PROJECT_NAME} \${PROJECT_VERSION} \${PROJECT_NAME}Targ
 EOF
 fi
 
-# Create cmake/xo-bootstrap-macros.cmake
-cat > "${TARGET_DIR}/cmake/xo-bootstrap-macros.cmake" << EOF
-# ----------------------------------------------------------------
-# for example:
-#   $ PREFIX=/usr/local   # for example
-#   $ cmake -DCMAKE_MODULE_PATH=prefix -DCMAKE_INSTALL_PREFIX=\$PREFIX -B .build
-#
-# will get
-#   CMAKE_MODULE_PATH
-# from xo-cmake-config --cmake-module-path
-#
-# and expect .cmake macros in
-#   CMAKE_MODULE_PATH/xo_macros/xo_cxx.cmake
-# ----------------------------------------------------------------
-
-find_program(XO_CMAKE_CONFIG_EXECUTABLE NAMES xo-cmake-config REQUIRED)
-
-if (("\${CMAKE_MODULE_PATH}" STREQUAL "") OR ("\${CMAKE_MODULE_PATH}" STREQUAL "prefix"))
-    message(FATAL "could not find xo-cmake-config executable")
-endif()
-
-if (NOT XO_SUBMODULE_BUILD)
-    if (("\${CMAKE_MODULE_PATH}" STREQUAL "") OR ("\${CMAKE_MODULE_PATH}" STREQUAL prefix))
-        # default to typical install location for xo-project-macros
-        execute_process(COMMAND \${XO_CMAKE_CONFIG_EXECUTABLE} --cmake-module-path OUTPUT_VARIABLE CMAKE_MODULE_PATH)
-        message(STATUS "CMAKE_MODULE_PATH=\${CMAKE_MODULE_PATH}")
-    endif()
-endif()
-
-# needs to have been installed somewhere on CMAKE_MODULE_PATH,
-# (e.g. from xo-cmake with the same value for CMAKE_INSTALL_PREFIX)
-#
-include(xo_macros/xo_cxx)
-
-xo_cxx_bootstrap_message()
-EOF
+# Copy cmake/xo-bootstrap-macros.cmake from xo-cmake/share
+cp "${XO_UMBRELLA_ROOT}/xo-cmake/share/xo-macros/xo-bootstrap-macros.cmake" "${TARGET_DIR}/cmake/"
 
 # Create cmake/xo_${NAME}Config.cmake.in
 cat > "${TARGET_DIR}/cmake/${LIB_NAME}Config.cmake.in" << EOF