diff --git a/src/etc/MAKEDEV.common b/src/etc/MAKEDEV.common
index 71d3061a..eecad8f6 100644
--- a/src/etc/MAKEDEV.common
+++ b/src/etc/MAKEDEV.common
@@ -1,4 +1,4 @@
-vers(a, {-$OpenBSD: MAKEDEV.common,v 1.54 2011/04/18 16:52:10 thib Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.common,v 1.55 2011/06/26 23:28:23 tedu Exp $-})dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -122,7 +122,6 @@ dnl  Note: not all disks are generated in 'all)'. (e.g. vax has a lot of
 dnl        disks that are not generated by 'all)')
 dnl
 divert(1)dnl
-target(all, mcd, 0)dnl
 twrget(all, fdesc, fd)dnl
 target(all, st, 0, 1)dnl
 target(all, std)dnl
@@ -219,9 +218,6 @@ __devtitle(dis, Disks)dnl
 __devitem(sd, {-sd*-}, {-SCSI disks{-,-} including flopticals-})dnl
 __devitem(cd, {-cd*-}, ATAPI and SCSI CD-ROM drives)dnl
 _mkdev(cd, cd*, {-dodisk2 cd $U major_cd_b major_cd_c $U 0{--}ifstep(cd)-})dnl
-__devitem(mcd, mcd*, Mitsumi CD-ROM drives)dnl
-_mkdev(mcd, mcd*, {-dodisk2 mcd $U major_mcd_b major_mcd_c $U 0{--}ifstep(mcd)dnl
--})dnl
 __devitem(bthub, {-bthub*-}, Bluetooth Hubs)dnl
 _mcdev(bthub, bthub*, bthub, {-major_bthub_c-})dnl
 __devitem(ch, {-ch*-}, SCSI media changers)dnl
diff --git a/src/etc/etc.amd64/MAKEDEV.md b/src/etc/etc.amd64/MAKEDEV.md
index c5cb5345..427e59d9 100644
--- a/src/etc/etc.amd64/MAKEDEV.md
+++ b/src/etc/etc.amd64/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,amd64)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.43 2010/09/30 15:27:54 claudio Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.44 2011/06/26 23:28:23 tedu Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -33,7 +33,6 @@ _TITLE(dis)
 _DEV(ccd, 18, 16)
 _DEV(cd, 15, 6)
 _DEV(flo, 9, 2)
-dnl _DEV(mcd, 39, 7)
 _DEV(raid, 54, 19)
 _DEV(rd, 47, 17)
 _DEV(sd, 13, 4)
@@ -146,4 +145,3 @@ target(all, agp, 0)dnl
 target(all, drm, 0)dnl
 twrget(ramd, wsdisp, ttyC, 0)dnl
 target(ramd, fd, 0)dnl
-dnl target(ramd, mcd, 0)dnl
diff --git a/src/etc/etc.i386/MAKEDEV.md b/src/etc/etc.i386/MAKEDEV.md
index 311f0cae..254efd43 100644
--- a/src/etc/etc.i386/MAKEDEV.md
+++ b/src/etc/etc.i386/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,i386)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.58 2010/09/30 15:27:54 claudio Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.59 2011/06/26 23:28:23 tedu Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -35,7 +35,6 @@ _TITLE(dis)
 _DEV(ccd, 18, 16)
 _DEV(cd, 15, 6)
 _DEV(flo, 9, 2)
-_DEV(mcd, 39, 7)
 _DEV(raid, 54, 19)
 _DEV(rd, 47, 17)
 _DEV(sd, 13, 4)
@@ -149,4 +148,3 @@ target(all, agp, 0)dnl
 target(all, drm, 0)dnl
 target(all, amdmsr)dnl
 twrget(ramd, wsdisp, ttyC, 0)dnl
-target(ramd, mcd, 0)dnl