diff --git a/etc/MAKEDEV b/etc/MAKEDEV
index a4919bbf772..759e14e0e03 100644
--- a/etc/MAKEDEV
+++ b/etc/MAKEDEV
@@ -151,8 +151,68 @@ fd*)
 			ln ${name}${unit} ${name}${unit}$i
 			ln r${name}${unit} r${name}${unit}$i
 		done
-		chgrp operator ${name}${unit} r${name}${unit}
-		chmod 640 ${name}${unit} r${name}${unit}
+		# User-readable and programmer-readable name sets
+
+		mknod ${name}${unit}.1720  b $blk `expr $unit '*' 64 + 1`
+		mknod r${name}${unit}.1720 c $chr `expr $unit '*' 64 + 1`
+		ln ${name}${unit}.1720 ${name}${unit}135hs21
+		ln r${name}${unit}.1720 r${name}${unit}135hs21
+
+		mknod ${name}${unit}.1480  b $blk `expr $unit '*' 64 + 2`
+		mknod r${name}${unit}.1480 c $chr `expr $unit '*' 64 + 2`
+		ln ${name}${unit}.1480 ${name}${unit}135hs18
+		ln r${name}${unit}.1480 r${name}${unit}135hs18
+		ln ${name}${unit}.1480 ${name}${unit}96hs18
+		ln r${name}${unit}.1480 r${name}${unit}96hs18
+
+		mknod ${name}${unit}.1440  b $blk `expr $unit '*' 64 + 3`
+		mknod r${name}${unit}.1440 c $chr `expr $unit '*' 64 + 3`
+		ln ${name}${unit}.1440 ${name}${unit}135
+		ln r${name}${unit}.1440 r${name}${unit}135
+		ln ${name}${unit}.1440 ${name}${unit}135ds18
+		ln r${name}${unit}.1440 r${name}${unit}135ds18
+		ln ${name}${unit}.1440 ${name}${unit}96ds18
+		ln r${name}${unit}.1440 r${name}${unit}96ds18
+
+		mknod ${name}${unit}.1200  b $blk `expr $unit '*' 64 + 4`
+		mknod r${name}${unit}.1200 c $chr `expr $unit '*' 64 + 4`
+		ln ${name}${unit}.1200 ${name}${unit}96
+		ln r${name}${unit}.1200 r${name}${unit}96
+		ln ${name}${unit}.1200 ${name}${unit}96ds15
+		ln r${name}${unit}.1200 r${name}${unit}96ds15
+		ln ${name}${unit}.1200 ${name}${unit}135ds15
+		ln r${name}${unit}.1200 r${name}${unit}135ds15
+
+		mknod ${name}${unit}.820  b $blk `expr $unit '*' 64 + 5`
+		mknod r${name}${unit}.820 c $chr `expr $unit '*' 64 + 5`
+		ln ${name}${unit}.820 ${name}${unit}96hs10
+		ln r${name}${unit}.820 r${name}${unit}96hs10
+		ln ${name}${unit}.820 ${name}${unit}135hs10
+		ln r${name}${unit}.820 r${name}${unit}135hs10
+
+		mknod ${name}${unit}.800  b $blk `expr $unit '*' 64 + 6`
+		mknod r${name}${unit}.800 c $chr `expr $unit '*' 64 + 6`
+		ln ${name}${unit}.800 ${name}${unit}96ds10
+		ln r${name}${unit}.800 r${name}${unit}96ds10
+		ln ${name}${unit}.800 ${name}${unit}135ds10
+		ln r${name}${unit}.800 r${name}${unit}135ds10
+
+		mknod ${name}${unit}.720  b $blk `expr $unit '*' 64 + 7`
+		mknod r${name}${unit}.720 c $chr `expr $unit '*' 64 + 7`
+		ln ${name}${unit}.720 ${name}${unit}96ds9
+		ln r${name}${unit}.720 r${name}${unit}96ds9
+		ln ${name}${unit}.720 ${name}${unit}135ds9
+		ln r${name}${unit}.720 r${name}${unit}135ds9
+
+		mknod ${name}${unit}.360  b $blk `expr $unit '*' 64 + 8`
+		mknod r${name}${unit}.360 c $chr `expr $unit '*' 64 + 8`
+		ln ${name}${unit}.360 ${name}${unit}48
+		ln r${name}${unit}.360 r${name}${unit}48
+		ln ${name}${unit}.360 ${name}${unit}48ds9
+		ln r${name}${unit}.360 r${name}${unit}48ds9
+
+		chgrp operator ${name}${unit}* r${name}${unit}*
+		chmod 640 ${name}${unit}* r${name}${unit}*
 		;;
 	*)
 		echo bad unit for disk in: $i
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index a4919bbf772..759e14e0e03 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -151,8 +151,68 @@ fd*)
 			ln ${name}${unit} ${name}${unit}$i
 			ln r${name}${unit} r${name}${unit}$i
 		done
-		chgrp operator ${name}${unit} r${name}${unit}
-		chmod 640 ${name}${unit} r${name}${unit}
+		# User-readable and programmer-readable name sets
+
+		mknod ${name}${unit}.1720  b $blk `expr $unit '*' 64 + 1`
+		mknod r${name}${unit}.1720 c $chr `expr $unit '*' 64 + 1`
+		ln ${name}${unit}.1720 ${name}${unit}135hs21
+		ln r${name}${unit}.1720 r${name}${unit}135hs21
+
+		mknod ${name}${unit}.1480  b $blk `expr $unit '*' 64 + 2`
+		mknod r${name}${unit}.1480 c $chr `expr $unit '*' 64 + 2`
+		ln ${name}${unit}.1480 ${name}${unit}135hs18
+		ln r${name}${unit}.1480 r${name}${unit}135hs18
+		ln ${name}${unit}.1480 ${name}${unit}96hs18
+		ln r${name}${unit}.1480 r${name}${unit}96hs18
+
+		mknod ${name}${unit}.1440  b $blk `expr $unit '*' 64 + 3`
+		mknod r${name}${unit}.1440 c $chr `expr $unit '*' 64 + 3`
+		ln ${name}${unit}.1440 ${name}${unit}135
+		ln r${name}${unit}.1440 r${name}${unit}135
+		ln ${name}${unit}.1440 ${name}${unit}135ds18
+		ln r${name}${unit}.1440 r${name}${unit}135ds18
+		ln ${name}${unit}.1440 ${name}${unit}96ds18
+		ln r${name}${unit}.1440 r${name}${unit}96ds18
+
+		mknod ${name}${unit}.1200  b $blk `expr $unit '*' 64 + 4`
+		mknod r${name}${unit}.1200 c $chr `expr $unit '*' 64 + 4`
+		ln ${name}${unit}.1200 ${name}${unit}96
+		ln r${name}${unit}.1200 r${name}${unit}96
+		ln ${name}${unit}.1200 ${name}${unit}96ds15
+		ln r${name}${unit}.1200 r${name}${unit}96ds15
+		ln ${name}${unit}.1200 ${name}${unit}135ds15
+		ln r${name}${unit}.1200 r${name}${unit}135ds15
+
+		mknod ${name}${unit}.820  b $blk `expr $unit '*' 64 + 5`
+		mknod r${name}${unit}.820 c $chr `expr $unit '*' 64 + 5`
+		ln ${name}${unit}.820 ${name}${unit}96hs10
+		ln r${name}${unit}.820 r${name}${unit}96hs10
+		ln ${name}${unit}.820 ${name}${unit}135hs10
+		ln r${name}${unit}.820 r${name}${unit}135hs10
+
+		mknod ${name}${unit}.800  b $blk `expr $unit '*' 64 + 6`
+		mknod r${name}${unit}.800 c $chr `expr $unit '*' 64 + 6`
+		ln ${name}${unit}.800 ${name}${unit}96ds10
+		ln r${name}${unit}.800 r${name}${unit}96ds10
+		ln ${name}${unit}.800 ${name}${unit}135ds10
+		ln r${name}${unit}.800 r${name}${unit}135ds10
+
+		mknod ${name}${unit}.720  b $blk `expr $unit '*' 64 + 7`
+		mknod r${name}${unit}.720 c $chr `expr $unit '*' 64 + 7`
+		ln ${name}${unit}.720 ${name}${unit}96ds9
+		ln r${name}${unit}.720 r${name}${unit}96ds9
+		ln ${name}${unit}.720 ${name}${unit}135ds9
+		ln r${name}${unit}.720 r${name}${unit}135ds9
+
+		mknod ${name}${unit}.360  b $blk `expr $unit '*' 64 + 8`
+		mknod r${name}${unit}.360 c $chr `expr $unit '*' 64 + 8`
+		ln ${name}${unit}.360 ${name}${unit}48
+		ln r${name}${unit}.360 r${name}${unit}48
+		ln ${name}${unit}.360 ${name}${unit}48ds9
+		ln r${name}${unit}.360 r${name}${unit}48ds9
+
+		chgrp operator ${name}${unit}* r${name}${unit}*
+		chmod 640 ${name}${unit}* r${name}${unit}*
 		;;
 	*)
 		echo bad unit for disk in: $i