diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh
index 14d2cea..24e0375 100755
--- a/scripts/remaster_generic_inner_chroot_script_after.sh
+++ b/scripts/remaster_generic_inner_chroot_script_after.sh
@@ -28,6 +28,7 @@ basic_environment_setup() {
 
 	if [ -f /etc/init.d/zfs ] && [ "$(uname -m)" = "x86_64" ]; then
 		rc-update add zfs boot
+		rc-update add zfs-shutdown shutdown
 	fi
 
 	# Always startup this