diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/dev/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/dev/make.defaults
new file mode 100644
index 0000000000..b1c02221ae
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/dev/make.defaults
@@ -0,0 +1,7 @@
+# Copyright (c) 2014 The CoreOS Authors. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+# full debug info is way to big to fit into our 1GB /usr partitions.
+INSTALL_MASK="${INSTALL_MASK}
+    /usr/lib/debug
+"
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
index 84929f64cd..2c2fcdc5bd 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults
@@ -9,29 +9,34 @@ USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls"
 # Exclude documentation
 FEATURES="nodoc noinfo noman"
 
-# Remove sandbox files since we don't use that in the sysroot.
+# Exclude even more documentaiton
 # Remove bash-completion files as we don't install bash-completion.
 # Remove alternate locales, we only need the standard LANG=C
 INSTALL_MASK="${INSTALL_MASK}
-  /etc/sandbox.d
   /usr/share/bash-completion
+  /usr/share/gtk-doc
   /usr/share/i18n
   /usr/share/locale
 "
 
+# Exclude assorted config files that we can do without
+INSTALL_MASK="${INSTALL_MASK}
+  /etc/sudoers
+"
+
 # Restrictive mask for production images.
 # TODO(marineam): Perhaps later move this to a generic/production profile.
 PROD_INSTALL_MASK="${INSTALL_MASK}
   *.a *.la *.h *.hpp
+  /etc/sandbox.d
+  /usr/include
   /usr/lib/debug
   /usr/lib*/pkgconfig
   /usr/share/aclocal*
   /usr/share/awk
-  /usr/share/doc
   /usr/share/gdb
   /usr/share/gettext
   /usr/share/gobject-introspection-1.0
-  /usr/share/gtk-doc
   /usr/share/pkgconfig
   /usr/share/readline
   /usr/src
@@ -44,8 +49,3 @@ PROD_INSTALL_MASK="${PROD_INSTALL_MASK}
   /usr/share/ncat
   /usr/share/nmap
 "
-
-# Exclude assorted config files that we can do without
-PROD_INSTALL_MASK="${PROD_INSTALL_MASK}
-  /etc/sudoers
-"
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults
new file mode 100644
index 0000000000..e37423ee7f
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults
@@ -0,0 +1,6 @@
+# Copyright (c) 2014 The CoreOS Authors. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+# default to the full PROD_INSTALL_MASK
+# TODO: after transitioning that list will just be defined here.
+INSTALL_MASK="${PROD_INSTALL_MASK}"