diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
index 40f713d069c8..5ea237eecaa4 100644
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -12,42 +12,43 @@ MAN= \
 	zfs.8 \
 	zfs-allow.8 \
 	zfs-bookmark.8 \
-	zfs-change-key.8 \
 	zfs-clone.8 \
 	zfs-create.8 \
 	zfs-destroy.8 \
 	zfs-diff.8 \
-	zfs-get.8 \
-	zfs-groupspace.8 \
 	zfs-hold.8 \
-	zfs-inherit.8 \
 	zfs-jail.8 \
 	zfs-list.8 \
 	zfs-load-key.8 \
 	zfs-mount.8 \
 	zfs-program.8 \
 	zfs-project.8 \
-	zfs-projectspace.8 \
 	zfs-promote.8 \
 	zfs-receive.8 \
-	zfs-recv.8 \
-	zfs-redact.8 \
-	zfs-release.8 \
 	zfs-rename.8 \
 	zfs-rollback.8 \
 	zfs-send.8 \
 	zfs-set.8 \
 	zfs-share.8 \
 	zfs-snapshot.8 \
-	zfs-unallow.8 \
-	zfs-unjail.8 \
-	zfs-unload-key.8 \
-	zfs-unmount.8 \
 	zfs-upgrade.8 \
 	zfs-userspace.8 \
 	zfs-wait.8 \
 	zfsconcepts.8 \
 	zfsprops.8
+MLINKS= \
+	zfs-allow.8 zfs-unallow.8 \
+	zfs-hold.8 zfs-release.8 \
+	zfs-jail.8 zfs-unjail.8 \
+	zfs-load-key.8 zfs-change-key.8 \
+	zfs-load-key.8 zfs-unload-key.8 \
+	zfs-mount.8 zfs-unmount.8 \
+	zfs-receive.8 zfs-recv.8 \
+	zfs-send.8 zfs-redact.8 \
+	zfs-set.8 zfs-get.8 \
+	zfs-set.8 zfs-inherit.8 \
+	zfs-userspace.8 zfs-groupspace.8 \
+	zfs-userspace.8 zfs-projectspace.8
 SRCS= \
 	zfs_iter.c \
 	zfs_iter.h \
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index 5e8434b0329b..fbde6beec331 100644
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -33,14 +33,12 @@ MAN= \
 	zpool-labelclear.8 \
 	zpool-list.8 \
 	zpool-offline.8 \
-	zpool-online.8 \
 	zpool-reguid.8 \
 	zpool-remove.8 \
 	zpool-reopen.8 \
 	zpool-replace.8 \
 	zpool-resilver.8 \
 	zpool-scrub.8 \
-	zpool-set.8 \
 	zpool-split.8 \
 	zpool-status.8 \
 	zpool-sync.8 \
@@ -49,6 +47,9 @@ MAN= \
 	zpool-wait.8 \
 	zpoolconcepts.8 \
 	zpoolprops.8
+MLINKS= \
+	zpool-offline.8 zpool-online.8 \
+	zpool-get.8 zpool-set.8
 SRCS= \
 	zpool_iter.c \
 	zpool_main.c \