diff -Nru zfs-linux-0.6.5.4/debian/changelog zfs-linux-0.6.5.4/debian/changelog
--- zfs-linux-0.6.5.4/debian/changelog	2016-02-19 09:24:00.000000000 -0600
+++ zfs-linux-0.6.5.4/debian/changelog	2016-02-20 17:25:51.000000000 -0600
@@ -1,3 +1,11 @@
+zfs-linux (0.6.5.4-0ubuntu4~1) xenial; urgency=medium
+
+  * zfs-zed: Install zed-functions.sh so scriptlets work
+  * zfs-zed: Enable most scriptlets on a fresh install.
+  * zfs-zed: Email root by default.
+
+ -- Richard Laager <rlaager@wiktel.com>  Sat, 20 Feb 2016 17:24:50 -0600
+
 zfs-linux (0.6.5.4-0ubuntu3) xenial; urgency=medium
 
   * zfsutils-linux should Recommend zfs-zed (LP: #1547549)
diff -Nru zfs-linux-0.6.5.4/debian/patches/enable-zed.patch zfs-linux-0.6.5.4/debian/patches/enable-zed.patch
--- zfs-linux-0.6.5.4/debian/patches/enable-zed.patch	1969-12-31 18:00:00.000000000 -0600
+++ zfs-linux-0.6.5.4/debian/patches/enable-zed.patch	2016-02-20 17:19:08.000000000 -0600
@@ -0,0 +1,29 @@
+Description: Enable zed emails
+ The OpenZFS event daemon monitors pools.  This patch enables the email
+ sending function by default (if zed is installed).  This is consistent with
+ the default behavior of mdadm.
+Author: Richard Laager <rlaager@wiktel.com>
+Forwarded: no
+
+Index: zfs-linux-0.6.5.3/cmd/zed/zed.d/zed.rc
+===================================================================
+--- zfs-linux-0.6.5.3.orig/cmd/zed/zed.d/zed.rc	2015-10-27 15:22:37.000000000 -0500
++++ zfs-linux-0.6.5.3/cmd/zed/zed.d/zed.rc	2016-01-31 23:13:49.826489152 -0600
+@@ -15,7 +15,7 @@
+ # Email will only be sent if ZED_EMAIL_ADDR is defined.
+ # Disabled by default; uncomment to enable.
+ #
+-#ZED_EMAIL_ADDR="root"
++ZED_EMAIL_ADDR="root"
+ 
+ ##
+ # Name or path of executable responsible for sending notifications via email;
+@@ -41,7 +41,7 @@
+ ##
+ # Minimum number of seconds between notifications for a similar event.
+ #
+-#ZED_NOTIFY_INTERVAL_SECS=3600
++ZED_NOTIFY_INTERVAL_SECS=3600
+ 
+ ##
+ # Notification verbosity.
diff -Nru zfs-linux-0.6.5.4/debian/patches/series zfs-linux-0.6.5.4/debian/patches/series
--- zfs-linux-0.6.5.4/debian/patches/series	2016-02-08 09:11:37.000000000 -0600
+++ zfs-linux-0.6.5.4/debian/patches/series	2016-02-20 17:19:08.000000000 -0600
@@ -4,3 +4,4 @@
 0003-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch
 1000-ppc64el-endian-support.patch
 1001-shift-param.h-include-order-to-avoid-header-loop-on-arm64.patch
+enable-zed.patch
diff -Nru zfs-linux-0.6.5.4/debian/zfs-zed.install zfs-linux-0.6.5.4/debian/zfs-zed.install
--- zfs-linux-0.6.5.4/debian/zfs-zed.install	2016-02-08 09:11:37.000000000 -0600
+++ zfs-linux-0.6.5.4/debian/zfs-zed.install	2016-02-20 17:19:32.000000000 -0600
@@ -1,4 +1,5 @@
 etc/zfs/zed.d/zed.rc
+etc/zfs/zed.d/zed-functions.sh usr/lib/zfs-linux/zfs/zed.d/
 usr/lib/zfs-linux/zfs/zed.d
 usr/sbin/zed
 usr/share/man/man8/zed.8
diff -Nru zfs-linux-0.6.5.4/debian/zfs-zed.links zfs-linux-0.6.5.4/debian/zfs-zed.links
--- zfs-linux-0.6.5.4/debian/zfs-zed.links	1969-12-31 18:00:00.000000000 -0600
+++ zfs-linux-0.6.5.4/debian/zfs-zed.links	2016-02-20 17:20:03.000000000 -0600
@@ -0,0 +1 @@
+usr/lib/zfs-linux/zfs/zed.d/zed-functions.sh etc/zfs/zed.d/zed-functions.sh
diff -Nru zfs-linux-0.6.5.4/debian/zfs-zed.postinst zfs-linux-0.6.5.4/debian/zfs-zed.postinst
--- zfs-linux-0.6.5.4/debian/zfs-zed.postinst	1969-12-31 18:00:00.000000000 -0600
+++ zfs-linux-0.6.5.4/debian/zfs-zed.postinst	2016-02-20 17:19:08.000000000 -0600
@@ -0,0 +1,28 @@
+#!/bin/sh
+set -e
+
+installed_dir=/usr/lib/zfs-linux/zfs/zed.d
+enabled_dir=/etc/zfs/zed.d
+
+# On a fresh install, enable most scriptlets.
+if [ -z "$2" ]
+then
+	for scriptlet in "$installed_dir"/*
+	do
+		name=$(basename "$scriptlet")
+		case "$name" in
+			all-debug.sh)
+				continue
+				;;
+			generic-notify.sh)
+				continue
+				;;
+		esac
+		if ! [ -e "$enabled_dir/$name" ]
+		then
+			ln -s "$scriptlet" "$enabled_dir/"
+		fi
+        done
+fi
+
+#DEBHELPER#
diff -Nru zfs-linux-0.6.5.4/debian/zfs-zed.postrm zfs-linux-0.6.5.4/debian/zfs-zed.postrm
--- zfs-linux-0.6.5.4/debian/zfs-zed.postrm	1969-12-31 18:00:00.000000000 -0600
+++ zfs-linux-0.6.5.4/debian/zfs-zed.postrm	2016-02-20 17:39:53.000000000 -0600
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "purge" ]
+then
+	for i in /etc/zfs/zed.d/*.sh
+	do
+		[ -L "$i" ] && rm -f "$i"
+	done
+fi
+
+#DEBHELPER#