diff --git a/release/powerpc/generate-hfs.sh b/release/powerpc/generate-hfs.sh
--- a/release/powerpc/generate-hfs.sh
+++ b/release/powerpc/generate-hfs.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # This script generates the dummy HFS filesystem used for the PowerPC boot
-# blocks. It uses hfsutils (emulators/hfsutils) to generate a template
+# blocks. It uses hfsutils (filesystems/hfsutils) to generate a template
 # filesystem with the relevant interesting files. These are then found by
 # grep, and the offsets written to a Makefile snippet.
 #
diff --git a/share/man/man4/ccd.4 b/share/man/man4/ccd.4
--- a/share/man/man4/ccd.4
+++ b/share/man/man4/ccd.4
@@ -228,7 +228,7 @@
 .Tn Linux
 RAID.
 Then you do a
-.Nm fsck.ext2fs Pq Pa ports/sysutils/e2fsprogs
+.Nm fsck.ext2fs Pq Pa ports/filesystems/e2fsprogs
 on the
 .Nm
 device using the
diff --git a/share/man/man4/smbfs.4 b/share/man/man4/smbfs.4
--- a/share/man/man4/smbfs.4
+++ b/share/man/man4/smbfs.4
@@ -62,7 +62,7 @@
 may be removed from a future version of
 .Fx .
 Users are advised to evaluate the
-.Pa sysutils/fusefs-smbnetfs
+.Pa filesystems/smbnetfs
 port instead.
 .Ef
 .Sh SEE ALSO
diff --git a/stand/powerpc/boot1.chrp/generate-hfs.sh b/stand/powerpc/boot1.chrp/generate-hfs.sh
--- a/stand/powerpc/boot1.chrp/generate-hfs.sh
+++ b/stand/powerpc/boot1.chrp/generate-hfs.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # This script generates the dummy HFS filesystem used for the PowerPC boot
-# blocks. It uses hfsutils (emulators/hfsutils) to generate a template
+# blocks. It uses hfsutils (filesystems/hfsutils) to generate a template
 # filesystem with the relevant interesting files. These are then found by
 # grep, and the offsets written to a Makefile snippet.
 #
diff --git a/tools/test/stress2/misc/ext2fs.sh b/tools/test/stress2/misc/ext2fs.sh
--- a/tools/test/stress2/misc/ext2fs.sh
+++ b/tools/test/stress2/misc/ext2fs.sh
@@ -32,7 +32,7 @@
 
 . ../default.cfg
 
-# Uses mke2fs from sysutils/e2fsprogs
+# Uses mke2fs from filesystems/e2fsprogs
 [ -z "`type mke2fs 2>/dev/null`" ] &&
     echo "Skipping test as mke2fs not installed" && exit 0
 
diff --git a/tools/test/stress2/misc/ext2fs2.sh b/tools/test/stress2/misc/ext2fs2.sh
--- a/tools/test/stress2/misc/ext2fs2.sh
+++ b/tools/test/stress2/misc/ext2fs2.sh
@@ -33,7 +33,7 @@
 
 . ../default.cfg
 
-# Uses mke2fs from sysutils/e2fsprogs
+# Uses mke2fs from filesystems/e2fsprogs
 [ -x /usr/local/sbin/mke2fs ] || exit 0
 mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint
 mdconfig -l | grep -q $mdstart &&  mdconfig -d -u $mdstart
diff --git a/tools/test/stress2/misc/ext2fs3.sh b/tools/test/stress2/misc/ext2fs3.sh
--- a/tools/test/stress2/misc/ext2fs3.sh
+++ b/tools/test/stress2/misc/ext2fs3.sh
@@ -35,7 +35,7 @@
 
 . ../default.cfg
 
-# Uses mke2fs from sysutils/e2fsprogs
+# Uses mke2fs from filesystems/e2fsprogs
 [ -z "`type mke2fs 2>/dev/null`" ] &&
     echo "Skipping test as mke2fs not installed" && exit 0
 
diff --git a/tools/test/stress2/misc/ext3fs.sh b/tools/test/stress2/misc/ext3fs.sh
--- a/tools/test/stress2/misc/ext3fs.sh
+++ b/tools/test/stress2/misc/ext3fs.sh
@@ -33,7 +33,7 @@
 
 . ../default.cfg
 
-# Uses mke2fs from sysutils/e2fsprogs
+# Uses mke2fs from filesystems/e2fsprogs
 [ -z "`type mke2fs 2>/dev/null`" ] &&
     echo "Skipping test as mke2fs not installed" && exit 0
 
diff --git a/tools/test/stress2/misc/ext4fs.sh b/tools/test/stress2/misc/ext4fs.sh
--- a/tools/test/stress2/misc/ext4fs.sh
+++ b/tools/test/stress2/misc/ext4fs.sh
@@ -36,7 +36,7 @@
 
 . ../default.cfg
 
-# Uses mke2fs from sysutils/e2fsprogs
+# Uses mke2fs from filesystems/e2fsprogs
 [ -z "`type mke2fs 2>/dev/null`" ] &&
     echo "Skipping test as mke2fs not installed" && exit 0
 
diff --git a/usr.sbin/autofs/autofs/special_media b/usr.sbin/autofs/autofs/special_media
--- a/usr.sbin/autofs/autofs/special_media
+++ b/usr.sbin/autofs/autofs/special_media
@@ -43,7 +43,7 @@
 			echo "-mountprog=/usr/local/sbin/mount.exfat,fstype=${_fstype},sync	:/dev/${_p}"
 		else
 			/usr/bin/logger -p info -t "special_media[$$]" \
-			    "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-exfat first"
+			    "Cannot mount ${_fstype} formatted device /dev/${_p}: Install filesystems/exfat first"
 			exit 1
 		fi
 		;;
@@ -52,7 +52,7 @@
 			echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype},sync	:/dev/${_p}"
 		else
 			/usr/bin/logger -p info -t "special_media[$$]" \
-			    "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-ntfs first"
+			    "Cannot mount ${_fstype} formatted device /dev/${_p}: Install filesystems/ntfs first"
 			exit 1
 		fi
 		;;