diff -Nru zfs-linux-0.6.5.9/debian/changelog zfs-linux-0.6.5.9/debian/changelog
--- zfs-linux-0.6.5.9/debian/changelog	2017-03-13 12:23:56.000000000 +0800
+++ zfs-linux-0.6.5.9/debian/changelog	2017-03-19 18:15:21.000000000 +0800
@@ -1,3 +1,16 @@
+zfs-linux (0.6.5.9-5) unstable; urgency=medium
+
+  * Add zfs initramfs conf for root pool setup
+    (Closes: #848157, LP: #1673197)
+
+ -- Aron Xu <aron@debian.org>  Sun, 19 Mar 2017 18:14:57 +0800
+
+zfs-linux (0.6.5.9-4) unstable; urgency=medium
+
+  * autopkgtest: load zfs module before running tests
+
+ -- Aron Xu <aron@debian.org>  Tue, 14 Mar 2017 11:38:08 +0800
+
 zfs-linux (0.6.5.9-3) unstable; urgency=medium
 
   [ Petter Reinholdtsen ]
diff -Nru zfs-linux-0.6.5.9/debian/tests/kernel-smoke-test zfs-linux-0.6.5.9/debian/tests/kernel-smoke-test
--- zfs-linux-0.6.5.9/debian/tests/kernel-smoke-test	2017-01-07 17:02:27.000000000 +0800
+++ zfs-linux-0.6.5.9/debian/tests/kernel-smoke-test	2017-03-14 11:37:29.000000000 +0800
@@ -38,6 +38,9 @@
 	exit 0
 fi
 
+# Load zfs kernel module before tests
+/sbin/modprobe zfs
+
 for t in ${TESTS}
 do
 	./debian/tests/$t
diff -Nru zfs-linux-0.6.5.9/debian/zfs zfs-linux-0.6.5.9/debian/zfs
--- zfs-linux-0.6.5.9/debian/zfs	1970-01-01 08:00:00.000000000 +0800
+++ zfs-linux-0.6.5.9/debian/zfs	2017-03-19 18:12:46.000000000 +0800
@@ -0,0 +1,8 @@
+for x in $(cat /proc/cmdline)
+do
+	case $x in
+		root=ZFS=*)
+			BOOT=zfs
+			;;
+	esac
+done
diff -Nru zfs-linux-0.6.5.9/debian/zfs-initramfs.install zfs-linux-0.6.5.9/debian/zfs-initramfs.install
--- zfs-linux-0.6.5.9/debian/zfs-initramfs.install	2017-03-10 15:28:09.000000000 +0800
+++ zfs-linux-0.6.5.9/debian/zfs-initramfs.install	2017-03-19 18:13:13.000000000 +0800
@@ -1 +1,2 @@
 usr/share/initramfs-tools/*
+debian/zfs usr/share/initramfs-tools/conf.d/