diff --git a/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV
index 0bf05aa2..07c1f866 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.70 2018/08/19 11:42:33 anton Exp 
-#	OpenBSD: MAKEDEV.common,v 1.103 2019/06/11 14:48:56 jcs Exp 
+#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.71 2019/12/13 21:03:57 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.104 2019/12/13 21:03:57 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -75,7 +75,6 @@
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
 #	gpio*	General Purpose Input/Output
-#	gpr*	GPR400 smartcard reader
 #	hotplug	devices hot plugging
 #	ipmi*	IPMI BMC access
 #	nvram	NVRAM access
@@ -337,10 +336,6 @@ hotplug)
 	M hotplug c 82 $U 400
 	;;
 
-gpr*)
-	M gpr$U c 80 $U
-	;;
-
 gpio*)
 	M gpio$U c 88 $U 600
 	;;
@@ -575,7 +570,7 @@ all)
 	R tun1 tun2 tun3 bio pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G
 	R fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0
 	R ch0 audio0 audio1 audio2 kcov bpf pvbus0 pvbus1 vmm fuse
-	R pppx hotplug ptm gpr0 local wscons pci0 pci1 pci2 pci3 uall
+	R pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
 	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
 	R tuner0 radio0 speaker video0 video1 uk0 random lpa0 lpa1
 	R lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03 tty04 tty05
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 236b1599..3fadfd07 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.i386/MAKEDEV.md,v 1.85 2019/05/10 11:27:23 sthen Exp 
-#	OpenBSD: MAKEDEV.common,v 1.103 2019/06/11 14:48:56 jcs Exp 
+#	OpenBSD: etc.i386/MAKEDEV.md,v 1.86 2019/12/13 21:03:57 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.104 2019/12/13 21:03:57 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -75,7 +75,6 @@
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
 #	gpio*	General Purpose Input/Output
-#	gpr*	GPR400 smartcard reader
 #	hotplug	devices hot plugging
 #	ipmi*	IPMI BMC access
 #	joy*	Joystick driver
@@ -337,10 +336,6 @@ hotplug)
 	M hotplug c 82 $U 400
 	;;
 
-gpr*)
-	M gpr$U c 80 $U
-	;;
-
 gpio*)
 	M gpio$U c 83 $U 600
 	;;
@@ -574,13 +569,13 @@ all)
 	R tap2 tap3 tun0 tun1 tun2 tun3 bio pty0 fd1 fd1B fd1C fd1D
 	R fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
 	R diskmap vscsi0 ch0 audio0 audio1 audio2 kcov bpf pvbus0
-	R pvbus1 fuse pppx hotplug ptm gpr0 local wscons pci0 pci1
-	R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
-	R rmidi6 rmidi7 tuner0 radio0 speaker video0 video1 uk0 random
-	R joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02
-	R tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b ttyc0
-	R ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm pf pctr wd0
-	R wd1 wd2 wd3 std st0 st1 fd
+	R pvbus1 fuse pppx hotplug ptm local wscons pci0 pci1 pci2
+	R pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6
+	R rmidi7 tuner0 radio0 speaker video0 video1 uk0 random joy0
+	R joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03
+	R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b ttyc0 ttyc1
+	R ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm pf pctr wd0 wd1 wd2
+	R wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)