diff --git a/etc/MAKEDEV.common b/etc/MAKEDEV.common
index 9f74030cfed..56d0572d63e 100644
--- a/etc/MAKEDEV.common
+++ b/etc/MAKEDEV.common
@@ -1,4 +1,4 @@
-vers(a, {-$OpenBSD: MAKEDEV.common,v 1.88 2016/05/21 15:17:49 deraadt Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.common,v 1.89 2016/05/26 16:29:51 deraadt Exp $-})dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -430,7 +430,7 @@ _mkdev(au, audio*, {-M sound$U	c major_au_c $U
 	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"-})dnl
 __devitem(vi, video*, Video V4L2 devices,video)dnl
-_mkdev(vi, video*, {-M video$U  c major_vi_c $U 600 
+_mkdev(vi, video*, {-M video$U  c major_vi_c $U 600
 	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"-})dnl
 __devitem(asc, asc*, ASC Audio device)dnl
 _mkdev(asc, asc*, {-M asc$U major_asc_c 0-})dnl
diff --git a/etc/Makefile b/etc/Makefile
index 5eb50b86f76..8577a662d27 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.424 2016/05/14 14:44:35 ajacoutot Exp $
+#	$OpenBSD: Makefile,v 1.425 2016/05/26 16:29:51 deraadt Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -47,7 +47,7 @@ EXAMPLES=chio.conf dhclient.conf dhcpd.conf exports \
 EXAMPLES_600=bgpd.conf dvmrpd.conf eigrpd.conf hostapd.conf iked.conf \
 	ipsec.conf ldapd.conf ldpd.conf ospf6d.conf ospfd.conf pf.conf \
 	radiusd.conf rc.local rc.securelevel rc.shutdown relayd.conf \
-	ripd.conf sasyncd.conf snmpd.conf vm.conf ypldap.conf 
+	ripd.conf sasyncd.conf snmpd.conf vm.conf ypldap.conf
 
 # -r-xr-xr-x
 RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd eigrpd ftpd \
@@ -213,7 +213,7 @@ distribution-etc-root-var: distrib-dirs
 		xargs sha256 -h ${DESTDIR}/var/sysmerge/etcsum || true
 	cd ${DESTDIR}/ && \
 		sort ${.CURDIR}/../distrib/sets/lists/etc/{mi,md.${MACHINE}} | \
-	    	pax -w -d | gzip -9 > ${DESTDIR}/var/sysmerge/etc.tgz
+		pax -w -d | gzip -9 > ${DESTDIR}/var/sysmerge/etc.tgz
 
 distribution:
 	exec ${SUDO} ${MAKE} distribution-etc-root-var
diff --git a/etc/Makefile.inc b/etc/Makefile.inc
index 50ac4975ca5..c53d4b16e85 100644
--- a/etc/Makefile.inc
+++ b/etc/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.7 2010/06/16 23:33:38 todd Exp $
+#	$OpenBSD: Makefile.inc,v 1.8 2016/05/26 16:29:51 deraadt Exp $
 
 M=${.CURDIR:C/^.*\/etc\.([^\/]*)$/\1/}
 
@@ -61,7 +61,7 @@ ${DOCDIR}/MAKEDEV.8: ${MAKEDEVDOC}
 		mdiffout1 > mdiffout2; \
 	    if [ -s mdiffout2 ]; then \
 		echo "    m4 -I.. -I. ../MAKEDEV.man > ${DOCDIR}/MAKEDEV.8"; \
-	    	cp MAKEDEV.mtmp ${DOCDIR}/MAKEDEV.8 || true; \
+		cp MAKEDEV.mtmp ${DOCDIR}/MAKEDEV.8 || true; \
 		${NOCLEAN} rm MAKEDEV.mtmp; \
 	    fi; \
 	    ${NOCLEAN} rm -f mdiffout1 mdiffout2; \
diff --git a/etc/rc b/etc/rc
index c69aae18ec1..ff730691278 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.481 2016/05/26 14:59:48 rpe Exp $
+#	$OpenBSD: rc,v 1.482 2016/05/26 16:29:51 deraadt Exp $
 
 # System startup script run by init on autoboot or after single-user.
 # Output and error are redirected to console by init, and the console is the
@@ -210,7 +210,7 @@ reorder_libs() {
 	if $_remount; then
 		mount -u -r $_dkdev
 	fi
-	
+
 	echo ' done.'
 }
 
@@ -311,7 +311,7 @@ if [[ $1 == shutdown ]]; then
 	exit 0
 fi
 
-# Add swap block-devices. 
+# Add swap block-devices.
 swapctl -A -t blk
 
 if [[ -e /fastboot ]]; then