diff --git a/distrib/amd64/ramdisks/ramdisk-cgdroot/Makefile b/distrib/amd64/ramdisks/ramdisk-cgdroot/Makefile
index 7be7a009f288..cb211dda391f 100644
--- a/distrib/amd64/ramdisks/ramdisk-cgdroot/Makefile
+++ b/distrib/amd64/ramdisks/ramdisk-cgdroot/Makefile
@@ -3,12 +3,21 @@
 IMAGE=		ramdisk-cgdroot.fs
 IMAGESIZE=	5000k
 IMAGEDEPENDS= 	
+MAKEDEVTARGETS=	all
 CRUNCHENV=	INIT_CHROOT=1
 SMALLPROG_INET6=1
 
+LISTS+=		${DISTRIBDIR}/common/list.cgdroot
+LISTS+=		${.CURDIR}/list
+
 .include "${.CURDIR}/../common/Makefile.ramdisk"
+.include "${DISTRIBDIR}/common/Makefile.makedev"
+
+# Needed by zfs stuff.
+CPPFLAGS+=	-D_REENTRANT
+
+${IMAGE}:	${NETBSDSRCDIR}/distrib/common/cgdroot.rc
 
-LISTS+=		${DISTRIBDIR}/common/list.cgdroot
 MTREECONF+=	${DISTRIBDIR}/common/mtree.cgdroot
 
 .if ${USE_INET6} != "no"
diff --git a/distrib/common/cgdroot.rc b/distrib/common/cgdroot.rc
index 4900b02e0bc4..70c99e11e527 100644
--- a/distrib/common/cgdroot.rc
+++ b/distrib/common/cgdroot.rc
@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2013 Pierre Pronchery <khorben@defora.org>
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
@@ -11,7 +11,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 # OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -54,9 +54,14 @@ if [ $? -ne 0 ]; then
 	umount /etc/cgd
 	exit 2
 fi
-mount -o ro /dev/cgd0a /altroot
-if [ $? -ne 0 ]; then
+zpool import -f -N rpool
+mount -t zfs rpool/ROOT /altroot
+if test -z "`mount | sed -n '/ on \/altroot /p'`"; then
+	mount -o ro /dev/cgd0a /altroot
+fi
+if test -z "`mount | sed -n '/ on \/altroot /p'`"; then
 	echo "Could not mount the root partition" 1>&2
+	zpool export rpool
 	cgdconfig -U
 	umount /etc/cgd
 	exit 2
diff --git a/distrib/common/list.cgdroot b/distrib/common/list.cgdroot
index b7eb941689e3..2cf0a9c4adeb 100644
--- a/distrib/common/list.cgdroot
+++ b/distrib/common/list.cgdroot
@@ -3,8 +3,34 @@
 # list file (c.f. parselist.awk) for cgd full-disk encryption.
 #
 
+SRCDIRS	external/cddl/osnet/sbin
+
 PROG	sbin/cgdconfig
 PROG	sbin/wsconsctl
+PROG	sbin/zfs
+PROG	sbin/zpool
+
+PROG	usr/bin/ktrace
+PROG	usr/bin/kdump
+
+LINK	sbin/zfs sbin/mount_zfs
+ARGVLN	zfs mount_zfs
+
+LIBS	-lzfs
+LIBS	-lzfs_core
+LIBS	-lzpool
+LIBS	-luutil
+LIBS	-lumem
+LIBS	-lavl
+LIBS	-lnvpair
 LIBS	-lcrypto
+#LIBS	-lutil	# replaced by libhack
+LIBS	-lz
+LIBS	-lm
+LIBS	-lpthread
 
+# Set up the rc script to configure cgd and mount file systems.
 COPY	${NETBSDSRCDIR}/distrib/common/cgdroot.rc etc/rc
+
+# Make firmware images available.
+SYMLINK	altroot/libdata libdata