diff --git a/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV
index 5444f0c4..38891181 100644
--- a/src/etc/etc.amd64/MAKEDEV
+++ b/src/etc/etc.amd64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.31 2008/06/28 21:46:05 mglocker Exp 
-#	OpenBSD: MAKEDEV.common,v 1.38 2008/06/12 22:38:14 todd Exp 
+#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.32 2008/07/14 16:21:52 miod Exp 
+#	OpenBSD: MAKEDEV.common,v 1.39 2008/07/14 16:22:23 miod Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -33,7 +33,6 @@
 #	ccd*	Concatenated disk devices
 #	cd*	ATAPI and SCSI CD-ROM drives
 #	fd*	Floppy disk drives (3 1/2", 5 1/4")
-#	mcd*	Mitsumi CD-ROM drives
 #	raid*	RAIDframe disk devices
 #	rd*	"rd" pseudo-disks
 #	sd*	SCSI disks, including flopticals
@@ -82,7 +81,6 @@
 #	gpr*	GPR400 smartcard reader
 #	hotplug	devices hot plugging
 #	iop*	I2O controller devices
-#	joy*	Joystick driver
 #	lkm	Loadable kernel modules interface
 #	music*	MIDI devices
 #	nvram	NVRAM access
@@ -334,10 +332,6 @@ lkm)
 	M lkm c 28 0 640 _lkm
 	;;
 
-joy*)
-	M joy$U c 26 $U 666
-	;;
-
 iop*)
 	M iop$U c 75 $U 660
 	;;
@@ -544,10 +538,6 @@ rd*)
 	dodisk2 rd $U 17 47 $U 0
 	;;
 
-mcd*)
-	dodisk2 mcd $U 7 39 $U 0
-	;;
-
 fd*)
 	typnam=$U${i#fd[01]*}
 	case $typnam in
@@ -594,11 +584,11 @@ all)
 	R fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H xfs0 ss0 ss1 ch0
 	R hotplug ptm gpr0 local wscons pci0 pci1 pci2 pci3 iop0 iop1
 	R uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
-	R tuner0 radio0 music0 speaker video0 audio0 uk0 random joy0
-	R joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02
-	R tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm
-	R crypto pf pctr systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2
-	R raid3 std st0 st1 fd mcd0
+	R tuner0 radio0 music0 speaker video0 audio0 uk0 random lpa0
+	R lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0
+	R ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm crypto pf pctr
+	R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1
+	R fd
 	;;
 
 wd*|sd*|raid*|ccd*)