diff --git a/src/etc/MAKEDEV.common b/src/etc/MAKEDEV.common
index 4b0e9d7f..5255f2d5 100644
--- a/src/etc/MAKEDEV.common
+++ b/src/etc/MAKEDEV.common
@@ -1,4 +1,4 @@
-vers(a, {-$OpenBSD: MAKEDEV.common,v 1.71 2013/09/16 08:17:02 dcoppa Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.common,v 1.72 2013/11/05 16:05:30 deraadt Exp $-})dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -159,7 +159,6 @@ target(all, radio, 0)dnl
 target(all, tuner, 0)dnl
 target(all, rmidi, 0, 1, 2, 3, 4, 5, 6, 7)dnl
 target(all, uall)dnl
-target(all, iop, 0, 1)dnl
 target(all, pci, 0, 1, 2, 3)dnl
 twrget(all, wsmouse, wscons)dnl
 target(all, par, 0)dnl
@@ -262,8 +261,6 @@ _mkdev(flo, fd*,
 	M r${nam}b	c $chr Add($n, 1) 640 operator
 	M r${nam}c	c $chr Add($n, 2) 640 operator
 	M r${nam}i	c $chr Add($n, 8) 640 operator-}, 664)dnl
-__devitem(iop, iop*, I2O controller devices)dnl
-_mcdev(iop, iop*, iop, {-major_iop_c-}, 660)dnl
 __devitem(wd, {-wd*-}, {-quote(winchester)disk drives (ST506{-,-} IDE{-,-} ESDI{-,-} RLL{-,-} ...)-})dnl
 __devitem(vnd, vnd*, quote(file)pseudo-disk devices)dnl
 _mkdev(vnd, vnd*, {-dodisk vnd $U major_vnd_b major_vnd_c $U 0{--}ifstep(vnd)-})dnl
diff --git a/src/etc/etc.alpha/MAKEDEV.md b/src/etc/etc.alpha/MAKEDEV.md
index a763f2f8..f52c81c4 100644
--- a/src/etc/etc.alpha/MAKEDEV.md
+++ b/src/etc/etc.alpha/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,alpha)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.58 2013/08/21 15:12:46 ajacoutot Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.59 2013/11/05 16:05:30 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -70,7 +70,6 @@ _DEV(diskmap, 63)
 _DEV(fdesc, 10)
 _DEV(fuse, 67)
 _DEV(hotplug, 56)
-_DEV(iop, 54)
 _DEV(lkm, 16)
 _DEV(pci, 52)
 _DEV(pf, 35)
diff --git a/src/etc/etc.amd64/MAKEDEV.md b/src/etc/etc.amd64/MAKEDEV.md
index 4895f5f9..888164eb 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.52 2013/08/21 15:12:46 ajacoutot Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.53 2013/11/05 16:05:30 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -80,7 +80,6 @@ _DEV(fuse, 92)
 _DEV(gpio, 88)
 _DEV(gpr, 80)
 _DEV(hotplug, 82)
-_DEV(iop, 75)
 dnl _DEV(joy, 26)
 _DEV(lkm, 28)
 _DEV(nvram, 85)
diff --git a/src/etc/etc.armish/MAKEDEV.md b/src/etc/etc.armish/MAKEDEV.md
index b0d8b154..7b7575a6 100644
--- a/src/etc/etc.armish/MAKEDEV.md
+++ b/src/etc/etc.armish/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,armish)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.28 2013/08/21 15:12:46 ajacoutot Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.29 2013/11/05 16:05:30 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -75,7 +75,6 @@ _DEV(diskmap, 102)
 _DEV(fdesc, 7)
 _DEV(fuse, 77)
 _DEV(hotplug, 37)
-_DEV(iop, 73)
 _DEV(lkm, 35)
 _DEV(pci, 88)
 _DEV(pf, 46)
diff --git a/src/etc/etc.armv7/MAKEDEV.md b/src/etc/etc.armv7/MAKEDEV.md
index de67e593..2773dc9d 100644
--- a/src/etc/etc.armv7/MAKEDEV.md
+++ b/src/etc/etc.armv7/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,armv7)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.2 2013/10/27 03:06:25 aalm Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.3 2013/11/05 16:05:30 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -76,7 +76,6 @@ _DEV(fdesc, 7)
 _DEV(fuse, 77)
 _DEV(gpio, 13)
 _DEV(hotplug, 37)
-_DEV(iop, 73)
 _DEV(lkm, 35)
 _DEV(pci, 88)
 _DEV(pf, 46)
diff --git a/src/etc/etc.i386/MAKEDEV.md b/src/etc/etc.i386/MAKEDEV.md
index 7babcd8f..1a447237 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.67 2013/08/21 15:12:48 ajacoutot Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.68 2013/11/05 16:05:30 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -83,7 +83,6 @@ _DEV(fuse, 93)
 _DEV(gpio, 83)
 _DEV(gpr, 80)
 _DEV(hotplug, 82)
-_DEV(iop, 75)
 _DEV(joy, 26)
 _DEV(lkm, 28)
 _DEV(nvram, 84)
diff --git a/src/etc/etc.landisk/MAKEDEV.md b/src/etc/etc.landisk/MAKEDEV.md
index 8ac2904a..4d76898b 100644
--- a/src/etc/etc.landisk/MAKEDEV.md
+++ b/src/etc/etc.landisk/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,landisk)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.30 2013/08/21 15:12:48 ajacoutot Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.31 2013/11/05 16:05:30 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -79,7 +79,6 @@ _DEV(diskmap,101)
 _DEV(fdesc, 7)
 _DEV(fuse, 103)
 _DEV(hotplug, 37)
-dnl _DEV(iop, 73)
 _DEV(lkm, 35)
 _DEV(pci, 88)
 _DEV(pf, 46)
diff --git a/src/etc/etc.macppc/MAKEDEV.md b/src/etc/etc.macppc/MAKEDEV.md
index 9e367554..29fda751 100644
--- a/src/etc/etc.macppc/MAKEDEV.md
+++ b/src/etc/etc.macppc/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,macppc)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.56 2013/08/21 15:12:49 ajacoutot Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.57 2013/11/05 16:05:30 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -90,7 +90,6 @@ _DEV(fdesc, 21)
 _DEV(fuse, 88)
 _DEV(gpio, 79)
 _DEV(hotplug, 78)
-_DEV(iop, 73)
 _DEV(lkm, 24)
 _DEV(pci, 71)
 _DEV(pf, 39)
diff --git a/src/etc/etc.socppc/MAKEDEV.md b/src/etc/etc.socppc/MAKEDEV.md
index e0b56c00..5bf5fde5 100644
--- a/src/etc/etc.socppc/MAKEDEV.md
+++ b/src/etc/etc.socppc/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,socppc)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.20 2013/08/21 15:12:49 ajacoutot Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.21 2013/11/05 16:05:30 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -67,7 +67,6 @@ _DEV(fdesc, 21)
 _DEV(fuse, 85)
 dnl _DEV(gpio, 79)
 _DEV(hotplug, 84)
-dnl _DEV(iop, 73)
 _DEV(lkm, 24)
 _DEV(pci, 71)
 _DEV(pf, 39)