diff --git a/Makefile.am b/Makefile.am
index 30c61dda27..c44d64df01 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -169,10 +169,8 @@ checkbashisms:
 PHONY += mancheck
 mancheck:
 	@if type mandoc > /dev/null 2>&1; then \
-		find ${top_srcdir}/man/man8 -type f -name 'zfs.8' \
-			-o -name 'zpool.8' -o -name 'zdb.8' \
-			-o -name 'zgenhostid.8' | \
-			xargs mandoc -Tlint -Werror; \
+		find ${top_srcdir}/man/man8 -type f -name '*[1-9]*' \
+			-exec mandoc -Tlint -Werror {} \+; \
 	else \
 		echo "skipping mancheck because mandoc is not installed"; \
 	fi
diff --git a/man/man8/zfs-mount-generator.8.in b/man/man8/zfs-mount-generator.8.in
index 3b8c9c3ae2..96fee42910 100644
--- a/man/man8/zfs-mount-generator.8.in
+++ b/man/man8/zfs-mount-generator.8.in
@@ -185,7 +185,6 @@ If set to
 .BR on ,
 do not generate a mount unit for this dataset.
 
-.RE
 See also
 .BR systemd.mount (5)
 
diff --git a/man/man8/zfs-program.8 b/man/man8/zfs-program.8
index de708e12ce..02251ae7cb 100644
--- a/man/man8/zfs-program.8
+++ b/man/man8/zfs-program.8
@@ -457,6 +457,7 @@ newbookmark (string)
 .Bd -ragged -compact -offset "xxxx"
 Full name of the new bookmark.
 .El
+.Ed
 .It Sy zfs.check submodule
 For each function in the zfs.sync submodule, there is a corresponding zfs.check
 function which performs a "dry run" of the same operation.
diff --git a/man/man8/zfs-wait.8 b/man/man8/zfs-wait.8
index de78a50929..9213fa20f1 100644
--- a/man/man8/zfs-wait.8
+++ b/man/man8/zfs-wait.8
@@ -66,6 +66,5 @@ Note that the internal delete queue does not finish draining until
 all large files have had time to be fully destroyed and all open file
 handles to unlinked files are closed.
 .El
-.El
 .Sh SEE ALSO
 .Xr lsof 8
diff --git a/man/man8/zfs_ids_to_path.8 b/man/man8/zfs_ids_to_path.8
index 9d6a4976ef..4f7b8429e4 100644
--- a/man/man8/zfs_ids_to_path.8
+++ b/man/man8/zfs_ids_to_path.8
@@ -35,7 +35,6 @@
 .Nm
 .Sh DESCRIPTION
 .Pp
-.LP
 The
 .Sy zfs_ids_to_path
 utility converts a provided objset and object id into a path to the file that
@@ -45,6 +44,7 @@ those ids refer to.
 Verbose.
 Print the dataset name and the file path within the dataset separately. This
 will work correctly even if the dataset is not mounted.
+.El
 .Sh SEE ALSO
 .Xr zfs 8 ,
 .Xr zdb 8
diff --git a/man/man8/zstream.8 b/man/man8/zstream.8
index 6056e097b0..2912f10c69 100644
--- a/man/man8/zstream.8
+++ b/man/man8/zstream.8
@@ -40,7 +40,6 @@
 .Ar resume_token
 .Sh DESCRIPTION
 .sp
-.LP
 The
 .Sy zstream
 utility manipulates zfs send streams, which are the output of the
@@ -104,6 +103,8 @@ Therefore, a deduplicated send stream can be received by running:
 .It Fl v
 Verbose.
 Print summary of converted records.
+.El
+.El
 .Sh SEE ALSO
 .Xr zfs 8 ,
 .Xr zfs-send 8 ,