diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh
index e08414bac3..80ef6dace6 100755
--- a/build_library/build_image_util.sh
+++ b/build_library/build_image_util.sh
@@ -154,6 +154,15 @@ write_packages() {
     fi
 }
 
+extract_docs() {
+    local root_fs_dir="$1"
+
+    info "Extracting docs"
+    tar --create --auto-compress --file="${BUILD_DIR}/doc.tar.bz2" \
+        --directory="${root_fs_dir}/usr/share/coreos" doc
+    sudo rm --recursive --force "${root_fs_dir}/usr/share/coreos/doc"
+}
+
 # Add an entry to the image's package.provided
 package_provided() {
     local p profile="${BUILD_DIR}/configroot/etc/portage/profile"    
diff --git a/build_library/prod_image_util.sh b/build_library/prod_image_util.sh
index ce681557f2..3e9644ee9b 100755
--- a/build_library/prod_image_util.sh
+++ b/build_library/prod_image_util.sh
@@ -47,6 +47,7 @@ create_prod_image() {
   extract_prod_gcc "${root_fs_dir}"
   emerge_to_image "${root_fs_dir}" "${base_pkg}"
   write_packages "${root_fs_dir}" "${BUILD_DIR}/${image_packages}"
+  extract_docs "${root_fs_dir}"
 
   # Assert that if this is supposed to be an official build that the
   # official update keys have been used.