diff --git a/debian/changelog b/debian/changelog
index 32dfef10..beedc898 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,9 @@ debian-cd (3.1.8) UNRELEASED; urgency=low
     Hardware Management Console needs the file to be in the root
     directory.
 
+  [ Robert Millan ]
+  * Add kfreebsd 9. Closes: #650926
+
  -- Steve McIntyre <93sam@debian.org>  Tue, 07 Jun 2011 23:03:42 +0100
 
 debian-cd (3.1.7) unstable; urgency=low
diff --git a/tools/boot/wheezy/boot-kfreebsd b/tools/boot/wheezy/boot-kfreebsd
index 235d7084..25edc82d 100644
--- a/tools/boot/wheezy/boot-kfreebsd
+++ b/tools/boot/wheezy/boot-kfreebsd
@@ -40,7 +40,7 @@ if [ $N != 1 ]; then
 fi
 
 # Download boot images.
-BOOT_IMAGES="cdrom/debian-cd_info.tar.gz cdrom/kfreebsd.gz cdrom/initrd.gz"
+BOOT_IMAGES="cdrom/debian-cd_info.tar.gz cdrom/kfreebsd.gz cdrom/kfreebsd-9.gz cdrom/initrd.gz"
 
 for image in $BOOT_IMAGES; do
        if [ ! -e "$image" ]; then
@@ -60,6 +60,7 @@ done
 # Install kernel and initrd
 mkdir -p $CDDIR/boot/kernel/
 cp "cdrom/kfreebsd.gz" "$CDDIR/boot/kernel/kfreebsd.gz"
+cp "cdrom/kfreebsd-9.gz" "$CDDIR/boot/kernel/kfreebsd-9.gz"
 cp "cdrom/initrd.gz" "$CDDIR/boot/mfsroot.gz"
 
 # Install bootloader
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index 0ec6f40b..96ab5b92 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -204,6 +204,7 @@ linux-image-prep
 
 #ifdef ARCH_kfreebsd_amd64
 kfreebsd-image-8-amd64
+kfreebsd-image-9-amd64
 grub-pc
 #endif
 
@@ -211,6 +212,9 @@ grub-pc
 kfreebsd-image-8-486
 kfreebsd-image-8-686
 kfreebsd-image-8-686-smp
+kfreebsd-image-9-486
+kfreebsd-image-9-686
+kfreebsd-image-9-686-smp
 grub-pc
 libc0.1-i686
 #endif