diff --git a/bundles/zfs/files/zfs-zed-override.service b/bundles/zfs/files/zfs-zed-override.service
new file mode 100644
index 0000000..8c68b6c
--- /dev/null
+++ b/bundles/zfs/files/zfs-zed-override.service
@@ -0,0 +1,6 @@
+[Service]
+# Default unit sets Restart=on-abort, which will not automatically
+# restart zed after system has suspended. I'm not sure why zed even
+# exits after suspending the system.
+Restart=always
+RestartSec=2
diff --git a/bundles/zfs/items.py b/bundles/zfs/items.py
index faa949f..8dda658 100644
--- a/bundles/zfs/items.py
+++ b/bundles/zfs/items.py
@@ -37,6 +37,13 @@ files = {
             'action:systemd-reload',
         },
     },
+    '/etc/systemd/system/zfs-zed.service.d/bundlewrap.conf': {
+        'source': 'zfs-zed-override.service',
+        'triggers': {
+            'action:systemd-reload',
+            'svc_systemd:zfs-zed:restart'
+        },
+    },
     '/etc/zfs-snapshot-config.json': {
         'content': dumps(
             node.metadata.get('zfs/snapshots', {}),