diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/cross_compile_config.cmake b/sdk_container/src/third_party/coreos-overlay/coreos/config/cross_compile_config.cmake
new file mode 100644
index 0000000000..af83a5cb1e
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/cross_compile_config.cmake
@@ -0,0 +1,4 @@
+# Fix up cross compiling CMake
+
+SET(KWSYS_LFS_WORKS "1" CACHE STRING "" FORCE)
+SET(KWSYS_CHAR_IS_SIGNED "1" CACHE STRING "" FORCE)
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-util/cmake b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-util/cmake
new file mode 100644
index 0000000000..f84b7288d2
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-util/cmake
@@ -0,0 +1,3 @@
+if [[ $(cros_target) != "cros_host" ]] ; then
+  CMAKE_EXTRA_CACHE_FILE="${CROS_ADDONS_TREE}/config/cross_compile_config.cmake"
+fi