diff --git a/build_library/disk_layout.json b/build_library/disk_layout.json
index d10d60a638..444abb4b44 100644
--- a/build_library/disk_layout.json
+++ b/build_library/disk_layout.json
@@ -50,9 +50,9 @@
         "mount":"/usr/share/oem"
       },
       "7":{
-        "type":"blank",
-        "label":"coreos-reserved",
-        "blocks":"0"
+        "label":"OEM-CONFIG",
+        "type":"coreos-reserved",
+        "blocks":"131072"
       },
       "8":{
         "type":"blank",
@@ -80,6 +80,13 @@
         "blocks":"33587200"
       }
     },
+    "teeth":{
+      "7":{
+        "label":"config-2",
+        "type":"data",
+        "fs_type":"ext2"
+      }
+    },
     "container":{
       "1":{
         "type":"blank"
diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 06e0d52f70..1a63a39e2f 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -14,6 +14,7 @@ VALID_IMG_TYPES=(
     qemu_no_kexec
     rackspace
     rackspace_vhd
+    teeth
     vagrant
     vagrant_vmware_fusion
     virtualbox
@@ -158,6 +159,11 @@ IMG_rackspace_vhd_BOOT_KERNEL=0
 IMG_rackspace_vhd_DISK_FORMAT=vhd
 IMG_rackspace_vhd_OEM_PACKAGE=oem-rackspace
 
+## teeth
+IMG_teeth_DISK_FORMAT=qcow2
+IMG_teeth_DISK_LAYOUT=teeth
+IMG_teeth_OEM_PACKAGE=oem-rackspace-teeth
+
 ###########################################################
 
 # Validate and set the vm type to use for the rest of the functions