diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
index 82aedd1ea080..f7023dff0709 100644
--- a/etc/systemd/system/Makefile.am
+++ b/etc/systemd/system/Makefile.am
@@ -2,7 +2,7 @@ systemdpreset_DATA = \
 	50-zfs.preset
 
 systemdunit_DATA = \
-	zed.service \
+	zfs-zed.service \
 	zfs-import-cache.service \
 	zfs-import-scan.service \
 	zfs-mount.service \
@@ -10,7 +10,7 @@ systemdunit_DATA = \
 	zfs.target
 
 EXTRA_DIST = \
-	$(top_srcdir)/etc/systemd/system/zed.service.in \
+	$(top_srcdir)/etc/systemd/system/zfs-zed.service.in \
 	$(top_srcdir)/etc/systemd/system/zfs-import-cache.service.in \
 	$(top_srcdir)/etc/systemd/system/zfs-import-scan.service.in \
 	$(top_srcdir)/etc/systemd/system/zfs-mount.service.in \
diff --git a/etc/systemd/system/zed.service.in b/etc/systemd/system/zfs-zed.service.in
similarity index 86%
rename from etc/systemd/system/zed.service.in
rename to etc/systemd/system/zfs-zed.service.in
index 5b23630923e1..4d4c9d841323 100644
--- a/etc/systemd/system/zed.service.in
+++ b/etc/systemd/system/zfs-zed.service.in
@@ -7,3 +7,6 @@ After=zfs-import-scan.service
 [Service]
 ExecStart=@sbindir@/zed -F
 Restart=on-abort
+
+[Install]
+Alias=zed.service
diff --git a/etc/systemd/system/zfs.target.in b/etc/systemd/system/zfs.target.in
index 35415338560a..ce110e573bac 100644
--- a/etc/systemd/system/zfs.target.in
+++ b/etc/systemd/system/zfs.target.in
@@ -2,7 +2,7 @@
 Description=ZFS startup target
 Requires=zfs-mount.service
 Requires=zfs-share.service
-Wants=zed.service
+Wants=zfs-zed.service
 
 [Install]
 WantedBy=multi-user.target