diff --git a/src/etc/Makefile.inc b/src/etc/Makefile.inc
index 31f86f14..76ce39c2 100644
--- a/src/etc/Makefile.inc
+++ b/src/etc/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2008/06/14 23:09:05 todd Exp $
+#	$OpenBSD: Makefile.inc,v 1.2 2008/06/15 01:51:55 todd Exp $
 
 MAKEDEVSRC=	${.CURDIR}/../MAKEDEV.mi
 MAKEDEVSRC+=	${.CURDIR}/../MAKEDEV.sub
@@ -6,8 +6,23 @@ MAKEDEVSRC+=	${.CURDIR}/../MAKEDEV.common
 MAKEDEVSRC+=	MAKEDEV.md
 
 MAKEDEV: ${MAKEDEVSRC}
-	@echo m4 -I.. ../MAKEDEV.mi '>' MAKEDEV
-	@m4 -I${.CURDIR}/.. \
-		${.CURDIR}/../MAKEDEV.mi > .MAKEDEV.tmp && \
-		mv .MAKEDEV.tmp MAKEDEV || \
-		rm .MAKEDEV.tmp
+	@if m4 -I${.CURDIR}/.. -I${.CURDIR} \
+	    ${.CURDIR}/../MAKEDEV.mi > MAKEDEV.tmp; then \
+	    if ! [ -f ${.CURDIR}/MAKEDEV ]; then \
+		echo "    m4 -I.. -I. ../MAKEDEV.mi > MAKEDEV"; \
+		cp MAKEDEV.tmp ${.CURDIR}/MAKEDEV; \
+		rm MAKEDEV.tmp; \
+		exit 0; \
+	    fi; \
+	    diff MAKEDEV.tmp ${.CURDIR}/MAKEDEV > diffout1 || true; \
+	    sed -e 's/^--.*$$//' \
+		-e 's/^[\<\>] #.*OpenBSD.*Exp $$//' \
+		-e 's/^[0-9]*c[0-9]*$$//' \
+		-e '/^$$/d' \
+		diffout1 > diffout2; \
+	    if [ -s diffout2 ]; then \
+		echo "    m4 -I.. -I. ../MAKEDEV.mi > MAKEDEV"; \
+	    	cp MAKEDEV.tmp ${.CURDIR}/MAKEDEV || true; \
+	    fi; \
+	    rm diffout1 diffout2; \
+	fi
diff --git a/src/etc/etc.alpha/Makefile b/src/etc/etc.alpha/Makefile
index 69a69966..3e6ad0af 100644
--- a/src/etc/etc.alpha/Makefile
+++ b/src/etc/etc.alpha/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:55 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.amd64/Makefile b/src/etc/etc.amd64/Makefile
index 69a69966..3e6ad0af 100644
--- a/src/etc/etc.amd64/Makefile
+++ b/src/etc/etc.amd64/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:55 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.armish/Makefile b/src/etc/etc.armish/Makefile
index 69a69966..3e6ad0af 100644
--- a/src/etc/etc.armish/Makefile
+++ b/src/etc/etc.armish/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:55 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.aviion/Makefile b/src/etc/etc.aviion/Makefile
index 69a69966..324bc976 100644
--- a/src/etc/etc.aviion/Makefile
+++ b/src/etc/etc.aviion/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.hp300/Makefile b/src/etc/etc.hp300/Makefile
index 69a69966..324bc976 100644
--- a/src/etc/etc.hp300/Makefile
+++ b/src/etc/etc.hp300/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.hppa/Makefile b/src/etc/etc.hppa/Makefile
index 69a69966..324bc976 100644
--- a/src/etc/etc.hppa/Makefile
+++ b/src/etc/etc.hppa/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.hppa64/Makefile b/src/etc/etc.hppa64/Makefile
index 26fbcdd4..324bc976 100644
--- a/src/etc/etc.hppa64/Makefile
+++ b/src/etc/etc.hppa64/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.i386/Makefile b/src/etc/etc.i386/Makefile
index 26fbcdd4..324bc976 100644
--- a/src/etc/etc.i386/Makefile
+++ b/src/etc/etc.i386/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.landisk/Makefile b/src/etc/etc.landisk/Makefile
index 26fbcdd4..324bc976 100644
--- a/src/etc/etc.landisk/Makefile
+++ b/src/etc/etc.landisk/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.luna88k/Makefile b/src/etc/etc.luna88k/Makefile
index 26fbcdd4..324bc976 100644
--- a/src/etc/etc.luna88k/Makefile
+++ b/src/etc/etc.luna88k/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.mac68k/Makefile b/src/etc/etc.mac68k/Makefile
index 26fbcdd4..324bc976 100644
--- a/src/etc/etc.mac68k/Makefile
+++ b/src/etc/etc.mac68k/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.macppc/Makefile b/src/etc/etc.macppc/Makefile
index 26fbcdd4..324bc976 100644
--- a/src/etc/etc.macppc/Makefile
+++ b/src/etc/etc.macppc/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.mvme68k/Makefile b/src/etc/etc.mvme68k/Makefile
index 26fbcdd4..324bc976 100644
--- a/src/etc/etc.mvme68k/Makefile
+++ b/src/etc/etc.mvme68k/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.mvme88k/Makefile b/src/etc/etc.mvme88k/Makefile
index 26fbcdd4..324bc976 100644
--- a/src/etc/etc.mvme88k/Makefile
+++ b/src/etc/etc.mvme88k/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.sgi/Makefile b/src/etc/etc.sgi/Makefile
index 26fbcdd4..324bc976 100644
--- a/src/etc/etc.sgi/Makefile
+++ b/src/etc/etc.sgi/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.socppc/Makefile b/src/etc/etc.socppc/Makefile
index 26fbcdd4..324bc976 100644
--- a/src/etc/etc.socppc/Makefile
+++ b/src/etc/etc.socppc/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.sparc/Makefile b/src/etc/etc.sparc/Makefile
index 26fbcdd4..324bc976 100644
--- a/src/etc/etc.sparc/Makefile
+++ b/src/etc/etc.sparc/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.sparc64/Makefile b/src/etc/etc.sparc64/Makefile
index 26fbcdd4..324bc976 100644
--- a/src/etc/etc.sparc64/Makefile
+++ b/src/etc/etc.sparc64/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.vax/Makefile b/src/etc/etc.vax/Makefile
index 26fbcdd4..324bc976 100644
--- a/src/etc/etc.vax/Makefile
+++ b/src/etc/etc.vax/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV
 
diff --git a/src/etc/etc.zaurus/Makefile b/src/etc/etc.zaurus/Makefile
index 26fbcdd4..324bc976 100644
--- a/src/etc/etc.zaurus/Makefile
+++ b/src/etc/etc.zaurus/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
-
-NOOBJ=
+#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
 
 all: MAKEDEV