diff --git a/src/etc/Makefile b/src/etc/Makefile
index dacfb00f..588aff4a 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.422 2016/04/25 20:38:10 tedu Exp $
+#	$OpenBSD: Makefile,v 1.423 2016/05/11 21:52:48 deraadt Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -269,7 +269,7 @@ distrib:
 	bootblocks ${ALL_KERNELS}
 
 SUBDIR+= etc.alpha etc.amd64 etc.armish etc.armv7
-SUBDIR+= etc.hppa etc.hppa64 etc.i386 etc.landisk etc.loongson etc.luna88k
+SUBDIR+= etc.hppa etc.i386 etc.landisk etc.loongson etc.luna88k
 SUBDIR+= etc.macppc etc.octeon
 SUBDIR+= etc.sgi etc.socppc etc.sparc etc.sparc64 etc.zaurus
 
diff --git a/src/etc/etc.hppa64/MAKEDEV b/src/etc/etc.hppa64/MAKEDEV
deleted file mode 100644
index f11f695f..00000000
--- a/src/etc/etc.hppa64/MAKEDEV
+++ /dev/null
@@ -1,512 +0,0 @@
-#!/bin/sh -
-#
-# THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
-# generated from:
-#
-#	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.33 2016/04/25 20:38:10 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.86 2016/04/25 20:39:42 tedu Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
-#
-#
-# Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Device "make" file.  Valid arguments:
-#	all	makes all known devices, including local devices.
-#		Tries to make the ``standard'' number of each type.
-#	ramdisk	Ramdisk kernel devices
-#	std	Standard devices
-#	local	Configuration specific devices
-# Disks:
-#	cd*	ATAPI and SCSI CD-ROM drives
-#	fd*	Floppy disk drives (3 1/2", 5 1/4")
-#	sd*	SCSI disks, including flopticals
-#	rd*	"rd" pseudo-disks
-#	vnd*	"file" pseudo-disk devices
-#	wd*	"winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
-# Tapes:
-#	ch*	SCSI media changers
-#	st*	SCSI tape drives
-# Terminal ports:
-#	tty[0-7][0-9a-f]	NS16x50 serial ports
-# Pseudo terminals:
-#	ptm	pty master device
-#	pty*	Set of 62 master pseudo terminals
-#	tty*	Set of 62 slave pseudo terminals
-# Console ports:
-#	ttyC-J*	wscons display devices
-#	wscons	Minimal wscons devices
-#	wskbd*	wscons keyboards
-#	wsmux	wscons keyboard/mouse mux devices
-# Pointing devices:
-#	wsmouse*	wscons mice
-# Printers:
-#	lpt*	IEEE 1284 centronics printer
-# USB devices:
-#	uall	All USB devices
-#	usb*	Bus control devices used by usbd for attach/detach
-#	uhid*	Generic HID devices
-#	ugen*	Generic USB devices
-#	ulpt*	Printer devices
-#	ttyU*	USB serial ports
-# Special purpose devices:
-#	audio*	Audio devices
-#	bio	ioctl tunnel pseudo-device
-#	bpf	Berkeley Packet Filter
-#	diskmap	Disk mapper
-#	fd	fd/* nodes
-#	fuse	Userland Filesystem
-#	pci*	PCI bus devices
-#	pdc	PDC device
-#	pf*	Packet Filter
-#	pppx*	PPP Multiplexer
-#	*random	In-kernel random data source
-#	tun*	Network tunnel driver
-#	tap*	Ethernet tunnel driver
-#	uk*	Unknown SCSI devices
-#	video*	Video V4L2 devices
-#	vscsi*	Virtual SCSI controller
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-T=$0
-
-# set this to echo for Echo-Only debugging
-[ "$eo" ] || eo=
-
-hex()
-{
-	case $1 in
-	[0-9]) echo -n $1;;
-	10) echo -n a;;
-	11) echo -n b;;
-	12) echo -n c;;
-	13) echo -n d;;
-	14) echo -n e;;
-	15) echo -n f;;
-	esac
-}
-
-alph2d()
-{
-	local t="$1"
-	local p="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	local sub=${p%${t}*}
-	echo ${#sub}
-}
-
-h2d()
-{
-	local s="$1"
-	local f=${s%*[0-9a-f]} n=${s#[0-9a-f]*}
-
-	echo $(($(_h2d $f)*16+ $(_h2d $n) ))
-}
-
-_h2d()
-{
-	case $1 in
-	[0-9]) echo -n $1;;
-	a) echo -n 10;;
-	b) echo -n 11;;
-	c) echo -n 12;;
-	d) echo -n 13;;
-	e) echo -n 14;;
-	f) echo -n 15;;
-	esac
-}
-
-unt()
-{
-	# XXX pdksh can't seem to deal with locally scoped variables
-	# in ${foo#$bar} expansions
-	arg="$1"
-	tmp="${arg#[a-zA-Z]*}"
-	tmp="${tmp%*[a-zA-Z]}"
-	while [ "$tmp" != "$arg" ]
-	do
-		arg=$tmp
-		tmp="${arg#[a-zA-Z]*}"
-		tmp="${tmp%*[a-zA-Z]}"
-	done
-	echo $arg
-}
-
-dodisk()
-{
-	[ "$DEBUG" ] && set -x
-	n=$(($((${5}*${7:-16}))+${6})) count=0
-	[ 0$7 -ne 8 ] && l="i j k l m n o p"
-	for d in a b c d e f g h $l
-	do
-		M $1$2$d	b $3 $(($n+$count)) 640 operator
-		M r$1$2$d	c $4 $(($n+$count)) 640 operator
-		let count=count+1
-	done
-}
-
-dodisk2()
-{
-	n=$(($(($5*${7:-16}))+$6))
-	M $1$2a b $3 $n 640 operator
-	M r$1$2a c $4 $n 640 operator
-	n=$(($n+2))
-	M $1$2c b $3 $n 640 operator
-	M r$1$2c c $4 $n 640 operator
-}
-
-# M name b/c major minor [mode] [group]
-RMlist[0]="rm -f"
-
-mkl() {
-	: ${mklist[0]:=";mknod"}
-	mklist[${#mklist[*]}]=" -m $1 $2 $3 $4 $5"
-}
-
-M() {
-	RMlist[${#RMlist[*]}]=$1
-	mkl ${5-666} $1 $2 $3 $4
-	G=${6:-wheel}
-	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
-	} || {
-		case $G in
-		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
-			whlist[${#whlist[*]}]="$1"
-		;;
-		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
-			oplist[${#oplist[*]}]="$1"
-		;;
-		*)
-			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
-		esac
-	}
-	return 0
-}
-
-R() {
-[ "$DEBUG" ] && set -x
-for i in "$@"
-do
-U=`unt $i`
-[ "$U" ] || U=0
-
-case $i in
-ramdisk)
-	R std fd st0 st1 sd0 sd1 sd2 sd3 rd0 random
-	R pty0 bpf bio diskmap
-	;;
-
-std)
-	M console	c 0 0 600
-	M tty		c 1 0
-	M mem		c 2 0 640 kmem
-	M kmem		c 2 1 640 kmem
-	M null		c 2 2
-	M zero		c 2 12
-	M stdin		c 16 0
-	M stdout	c 16 1
-	M stderr	c 16 2
-	M ksyms		c 25 0 640 kmem
-	M klog		c 6 0 600
-	M pdc		c 22 0 640 operator
-	;;
-
-vscsi*)
-	M vscsi$U c 54 $U 600
-	;;
-
-video*)
-	M video$U  c 33 $U
-	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
-	;;
-
-uk*)
-	M uk$U c 15 $U 640 operator
-	;;
-
-tap*)
-	M tap$U c 59 $U 600
-	;;
-
-tun*)
-	M tun$U c 18 $U 600
-	;;
-
-*random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 20 $n 644
-		n=$(($n+1))
-	done
-	;;
-
-pppx*)
-	M pppx$U c 57 $U 600
-	;;
-
-pf*)
-	M pf c 21 0 600
-	;;
-
-pci*)
-	M pci$U	c 31 $U 600
-	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
-	;;
-
-fuse)
-	M fuse$U c 58 $U 600
-	;;
-
-fd)
-	RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
-	while [ $n -lt 64 ];do M fd/$n c 16 $n;n=$(($n+1));done
-	MKlist[${#MKlist[*]}]=";chmod 555 fd"
-	;;
-
-diskmap)
-	M diskmap c 56 0 640 operator
-	;;
-
-bpf)
-	M bpf c 17 0 600
-	M bpf0 c 17 0 600
-	;;
-
-bio)
-	M bio c 37 0 600
-	;;
-
-audio*)
-	M sound$U	c 35 $U
-	M mixer$U	c 35 $(($U+16))
-	M audio$U	c 35 $(($U+128))
-	M audioctl$U	c 35 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
-	;;
-
-ttyU[0-9a-zA-Z])
-	U=${i#ttyU*}
-	o=$(alph2d $U)
-	M ttyU$U c 45 $o 660 dialer uucp
-	M cuaU$U c 45 $(($o+128)) 660 dialer uucp
-	;;
-
-ulpt*)
-	M ulpt$U c 43 $U 660
-	;;
-
-ugen*)
-	n=$(($U*16))
-	for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5}
-	do
-		M ugen$U.$j c 42 $(($n+10#$j)) 660
-	done
-	;;
-
-uhid*)
-	M uhid$U c 41 $U 660
-	;;
-
-usb*)
-	[ "$i" = "usb" ] && u= || u=$U
-	M usb$u c 40 $U 660
-	;;
-
-uall)
-	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ugen2 ugen3 ugen4 ugen5
-	R ugen6 ugen7 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3 usb0 usb1
-	R usb2 usb3 usb4 usb5 usb6 usb7
-	;;
-
-lpt*|lpa*)
-	case $i in
-	lpt*) n=lpt f=0;;
-	lpa*) n=lpa f=128;;
-	esac
-	M $n$U c 26 $(($U+$f)) 600
-	;;
-
-wsmouse[0-9]*)
-	M wsmouse$U c 29 $U 600
-	;;
-
-wsmux|wsmouse|wskbd)
-	M wsmouse c 30 0 600
-	M wskbd c 30 1 600
-	;;
-
-wskbd[0-9]*)
-	M wskbd$U c 28 $U 600
-	;;
-
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
-	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
-tty[C-J]*)
-	U=${i##tty[C-J]}
-	case $i in
-	ttyC*) n=C m=0;;
-	ttyD*) n=D m=256;;
-	ttyE*) n=E m=512;;
-	ttyF*) n=F m=768;;
-	ttyG*) n=G m=1024;;
-	ttyH*) n=H m=1280;;
-	ttyI*) n=I m=1536;;
-	ttyJ*) n=J m=1792;;
-	esac
-	case $U in
-	[0-9a-f]) M tty$n$U c 27 $((16#$U+$m)) 600;;
-	cfg) M tty${n}cfg c 27 $((255+$m)) 600;;
-	*) echo bad unit $U for $i; exit 1;;
-	esac
-	;;
-
-pty*)
-	if [ $U -gt 15 ]; then
-		echo bad unit for pty in: $i
-		continue
-	fi
-	set -A letters p q r s t u v w x y z P Q R S T
-	set -A suffixes 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q \
-	    r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X \
-	    Y Z
-
-	name=${letters[$U]}
-	n=0
-	while [ $n -lt 62 ]
-	do
-		nam=$name${suffixes[$n]}
-		off=$(($U*62))
-		M tty$nam c 4 $(($off+$n))
-		M pty$nam c 5 $(($off+$n))
-		n=$(($n+1))
-	done
-	;;
-
-ptm)
-	M ptm c 38 0 666
-	;;
-
-tty[0-7][0-9a-f])
-	U=${i#tty*}
-	o=$(h2d $U)
-	M tty$U c 23 $o 660 dialer uucp
-	M cua$U c 23 $(($o+128)) 660 dialer uucp
-	;;
-
-st*)
-	n=$(($U*16))
-	for pre in " " n e en
-	do
-		M ${pre}st$U	b 5 $n 660 operator
-		M ${pre}rst$U	c 11 $n 660 operator
-		n=$(($n+1))
-	done
-	;;
-
-ch*)
-	M ch$U c 13 $U 660 operator
-	;;
-
-vnd*)
-	dodisk vnd $U 2 8 $U 0
-	;;
-
-rd*)
-	dodisk2 rd $U 3 9 $U 0
-	;;
-
-fd*)
-	typnam=$U${i#fd[01]*}
-	case $typnam in
-	0|1)	typnum=0;; # no type specified, assume A
-	*A)	typnum=0; typnam=0;;
-	*B)	typnum=1;;
-	*C)	typnum=2;;
-	*D)	typnum=3;;
-	*E)	typnum=4;;
-	*F)	typnum=5;;
-	*G)	typnum=6;;
-	*H)	typnum=7;;
-	*)	echo bad type $typnam for $i; exit 1;;
-	esac
-	case $U in
-	0|1)	blk=7; chr=24;;
-	*)	echo bad unit $U for $i; exit 1;;
-	esac
-	nam=fd${typnam}
-	n=$(($(($U*128))+$(($typnum*16))))
-	M ${nam}a	b $blk $n 640 operator
-	M ${nam}b	b $blk $(($n+1)) 640 operator
-	M ${nam}c	b $blk $(($n+2)) 640 operator
-	M ${nam}i	b $blk $(($n+8)) 640 operator
-	M r${nam}a	c $chr $n 640 operator
-	M r${nam}b	c $chr $(($n+1)) 640 operator
-	M r${nam}c	c $chr $(($n+2)) 640 operator
-	M r${nam}i	c $chr $(($n+8)) 640 operator
-	;;
-
-cd*)
-	dodisk2 cd $U 6 12 $U 0
-	;;
-
-local)
-	test -s $T.local && sh $T.local
-	;;
-
-all)
-	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
-	R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0
-	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D
-	R fd0E fd0F fd0G fd0H diskmap vscsi0 ch0 audio0 audio1 audio2
-	R bpf fuse pppx ptm local wscons pci0 pci1 pci2 pci3 uall
-	R video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00
-	R tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a
-	R tty0b pf wd0 wd1 wd2 wd3 std st0 st1 fd
-	;;
-
-wd*|sd*)
-	case $i in
-	wd*) dodisk wd $U 8 39 $U 0;;
-	sd*) dodisk sd $U 4 10 $U 0;;
-	esac
-	;;
-
-*)
-	echo $i: unknown device
-	;;
-esac
-done
-}
-R "$@"
-{
-echo -n ${RMlist[*]}
-echo -n ${mklist[*]}
-echo -n ${MKlist[*]}
-echo -n ${whlist[*]}
-echo ${oplist[*]}
-} | if [ "$eo" = "echo" ]; then
-        cat
-else
-	sh
-fi
diff --git a/src/etc/etc.hppa64/MAKEDEV.md b/src/etc/etc.hppa64/MAKEDEV.md
deleted file mode 100644
index b31c97ee..00000000
--- a/src/etc/etc.hppa64/MAKEDEV.md
+++ /dev/null
@@ -1,106 +0,0 @@
-define(MACHINE,hppa64)dnl
-vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.34 2016/04/28 18:17:31 natano Exp $-},
-etc.MACHINE)dnl
-dnl
-dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
-dnl
-dnl Permission to use, copy, modify, and distribute this software for any
-dnl purpose with or without fee is hereby granted, provided that the above
-dnl copyright notice and this permission notice appear in all copies.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-dnl WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-dnl MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-dnl ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl
-_TITLE(make)
-_DEV(all)
-_DEV(ramdisk)
-_DEV(std)
-_DEV(local)
-_TITLE(dis)
-_DEV(cd, 12, 6)
-_DEV(flo, 24, 7)
-_DEV(sd, 10, 4)
-_DEV(rd, 9, 3)
-_DEV(vnd, 8, 2)
-_DEV(wd, 39, 8)
-_TITLE(tap)
-_DEV(ch, 13)
-_DEV(st, 11, 5)
-_TITLE(term)
-_DEV(com, 23)
-dnl _TITLE(call)
-_TITLE(pty)
-_DEV(ptm, 38)
-_DEV(pty, 5)
-_DEV(tty, 4)
-_TITLE(cons)
-_DEV(wsdisp, 27)
-_DEV(wscons)
-_DEV(wskbd, 28)
-_DEV(wsmux, 30)
-_TITLE(point)
-_DEV(wsmouse, 29)
-_TITLE(prn)
-_DEV(lpt, 26)
-_TITLE(usb)
-_DEV(uall)
-_DEV(usb, 40)
-_DEV(uhid, 41)
-_DEV(ugen, 42)
-_DEV(ulpt, 43)
-_DEV(ttyU, 45)
-_TITLE(spec)
-_DEV(au, 35)
-_DEV(bio, 37)
-_DEV(bpf, 17)
-_DEV(diskmap,56)
-_DEV(fdesc, 16)
-_DEV(fuse, 58)
-_DEV(pci, 31)
-_DEV(pdc, 22)
-_DEV(pf, 21)
-_DEV(pppx,57)
-_DEV(rnd, 20)
-_DEV(tun, 18)
-_DEV(tap, 59)
-_DEV(uk, 15)
-_DEV(vi, 33)
-_DEV(vscsi, 54)
-dnl
-divert(__mddivert)dnl
-dnl
-ramdisk)
-	_recurse std fd st0 st1 sd0 sd1 sd2 sd3 rd0 random
-	_recurse pty0 bpf bio diskmap
-	;;
-
-_std(1, 2, 25, 6)
-	M pdc		c 22 0 640 operator
-	;;
-dnl
-dnl *** hppa64 specific devices
-dnl
-twrget(all, au, audio, 0, 1, 2)dnl
-target(all, ch, 0)dnl
-target(all, vscsi, 0)dnl
-target(all, diskmap)dnl
-twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
-twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
-target(all, pty, 0)dnl
-target(all, bio)dnl
-target(all, tun, 0, 1, 2, 3)dnl
-target(all, tap, 0, 1, 2, 3)dnl
-target(all, xy, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
-target(all, cd, 0, 1)dnl
-target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-target(ramd, pty, 0)dnl
-target(ramd, hil)dnl
diff --git a/src/etc/etc.hppa64/Makefile b/src/etc/etc.hppa64/Makefile
deleted file mode 100644
index 324bc976..00000000
--- a/src/etc/etc.hppa64/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2008/06/15 01:51:56 todd Exp $
-
-all: MAKEDEV
-
-.include <bsd.prog.mk>
diff --git a/src/etc/etc.hppa64/Makefile.inc b/src/etc/etc.hppa64/Makefile.inc
deleted file mode 100644
index b9288aac..00000000
--- a/src/etc/etc.hppa64/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.8 2011/07/22 09:30:54 espie Exp $
-
-bootblocks:
-	cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR}
-
-MDEXT=	bsd.rd cd${OSrev}.iso lif${OSrev}.fs xxboot
diff --git a/src/etc/etc.hppa64/disktab b/src/etc/etc.hppa64/disktab
deleted file mode 100644
index e813dfd0..00000000
--- a/src/etc/etc.hppa64/disktab
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: disktab,v 1.4 2015/08/14 23:45:55 krw Exp $
-
-rdroot|ramdiskroot|RAM-disk root FS image:\
-	:dt=rdroot:se#512:nc#20:nt#2:ns#128:\
-	:ta=4.2BSD:oa#0:pa#5120:fa#1024:ba#8192:\
-	:ob#0:pb#0:oc#0:pc#5120:
diff --git a/src/etc/etc.hppa64/fbtab b/src/etc/etc.hppa64/fbtab
deleted file mode 100644
index d0c58313..00000000
--- a/src/etc/etc.hppa64/fbtab
+++ /dev/null
@@ -1 +0,0 @@
-/dev/console	0600	/dev/ttyC0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg
diff --git a/src/etc/etc.hppa64/login.conf b/src/etc/etc.hppa64/login.conf
deleted file mode 100644
index 0f98caeb..00000000
--- a/src/etc/etc.hppa64/login.conf
+++ /dev/null
@@ -1,107 +0,0 @@
-# $OpenBSD: login.conf,v 1.5 2015/10/23 22:55:50 sthen Exp $
-
-#
-# Sample login.conf file.  See login.conf(5) for details.
-#
-
-#
-# Standard authentication styles:
-#
-# passwd	Use only the local password file
-# chpass	Do not authenticate, but change users password (change
-#		the YP password if the user has one, else change the
-#		local password)
-# lchpass	Do not login; change user's local password instead
-# radius	Use radius authentication
-# reject	Use rejected authentication
-# skey		Use S/Key authentication
-# activ		ActivCard X9.9 token authentication
-# crypto	CRYPTOCard X9.9 token authentication
-# snk		Digital Pathways SecureNet Key authentication
-# tis		TIS Firewall Toolkit authentication
-# token		Generic X9.9 token authentication
-# yubikey	YubiKey authentication
-#
-
-# Default allowed authentication styles
-auth-defaults:auth=passwd,skey:
-
-# Default allowed authentication styles for authentication type ftp
-auth-ftp-defaults:auth-ftp=passwd:
-
-#
-# The default values
-# To alter the default authentication types change the line:
-#	:tc=auth-defaults:\
-# to be read something like: (enables passwd, "myauth", and activ)
-#	:auth=passwd,myauth,activ:\
-# Any value changed in the daemon class should be reset in default
-# class.
-#
-default:\
-	:path=/usr/bin /bin /usr/sbin /sbin /usr/X11R6/bin /usr/local/bin /usr/local/sbin:\
-	:umask=022:\
-	:datasize-max=512M:\
-	:datasize-cur=512M:\
-	:maxproc-max=256:\
-	:maxproc-cur=128:\
-	:openfiles-cur=512:\
-	:stacksize-cur=4M:\
-	:localcipher=blowfish,8:\
-	:tc=auth-defaults:\
-	:tc=auth-ftp-defaults:
-
-#
-# Settings used by /etc/rc and root
-# This must be set properly for daemons started as root by inetd as well.
-# Be sure reset these values back to system defaults in the default class!
-#
-daemon:\
-	:ignorenologin:\
-	:datasize=infinity:\
-	:maxproc=infinity:\
-	:openfiles-cur=128:\
-	:stacksize-cur=8M:\
-	:localcipher=blowfish,9:\
-	:tc=default:
-
-#
-# Staff have fewer restrictions and can login even when nologins are set.
-#
-staff:\
-	:datasize-cur=512M:\
-	:datasize-max=infinity:\
-	:maxproc-max=512:\
-	:maxproc-cur=128:\
-	:ignorenologin:\
-	:requirehome@:\
-	:tc=default:
-
-#
-# Authpf accounts get a special motd and shell
-#
-authpf:\
-	:welcome=/etc/motd.authpf:\
-	:shell=/usr/sbin/authpf:\
-	:tc=default:
-
-#
-# Building ports with DPB uses raised limits
-#
-pbuild:\
-	:datasize-max=infinity:\
-	:datasize-cur=1024M:\
-	:maxproc-max=1024:\
-	:maxproc-cur=256:\
-	:tc=default:
-
-#
-# Override resource limits for certain daemons started by rc.d(8)
-#
-bgpd:\
-	:openfiles-cur=512:\
-	:tc=daemon:
-
-unbound:\
-	:openfiles-cur=512:\
-	:tc=daemon:
diff --git a/src/etc/etc.hppa64/sysctl.conf b/src/etc/etc.hppa64/sysctl.conf
deleted file mode 100644
index 49111d23..00000000
--- a/src/etc/etc.hppa64/sysctl.conf
+++ /dev/null
@@ -1 +0,0 @@
-#machdep.led_blink=1		# 1=make led(s) blink
diff --git a/src/etc/etc.hppa64/ttys b/src/etc/etc.hppa64/ttys
deleted file mode 100644
index fff3252c..00000000
--- a/src/etc/etc.hppa64/ttys
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-#	$OpenBSD: ttys,v 1.2 2008/01/09 17:39:42 miod Exp $
-#
-# name	getty				type	status		comments
-#
-# If the console is marked insecure, single-user requires
-# the root password.
-console "/usr/libexec/getty std.9600"	vt220	on  secure
-ttyC0	"/usr/libexec/getty std.9600"	vt220	off secure
-ttyD0	"/usr/libexec/getty std.9600"	vt220	off secure
-tty00	"/usr/libexec/getty std.9600"	unknown off secure
-tty01	"/usr/libexec/getty std.9600"	unknown off secure
-tty02	"/usr/libexec/getty std.9600"	unknown off secure
-tty03	"/usr/libexec/getty std.9600"	unknown off secure
-tty04	"/usr/libexec/getty std.9600"	unknown off secure
-tty05	"/usr/libexec/getty std.9600"	unknown off secure
-tty06	"/usr/libexec/getty std.9600"	unknown off secure
-tty07	"/usr/libexec/getty std.9600"	unknown off secure
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index fd2ca984..0b7b9095 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.281 2016/04/25 20:38:11 tedu Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.282 2016/05/11 21:52:48 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 
@@ -530,8 +530,6 @@ usr
                 ..
                 hppa
                 ..
-                hppa64
-                ..
                 i386
                 ..
                 landisk
@@ -562,8 +560,6 @@ usr
                 ..
                 hppa
                 ..
-                hppa64
-                ..
                 i386
                 ..
                 landisk
diff --git a/src/lib/libcrypto/crypto/arch/hppa64/opensslconf.h b/src/lib/libcrypto/crypto/arch/hppa64/opensslconf.h
deleted file mode 100644
index 54b8f59b..00000000
--- a/src/lib/libcrypto/crypto/arch/hppa64/opensslconf.h
+++ /dev/null
@@ -1,157 +0,0 @@
-#include <openssl/opensslfeatures.h>
-/* crypto/opensslconf.h.in */
-
-/* Generate 80386 code? */
-#undef I386_ONLY
-
-#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define OPENSSLDIR "/etc/ssl"
-#endif
-
-#undef OPENSSL_UNISTD
-#define OPENSSL_UNISTD <unistd.h>
-
-#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
-#define IDEA_INT unsigned int
-#endif
-
-#if defined(HEADER_MD2_H) && !defined(MD2_INT)
-#define MD2_INT unsigned int
-#endif
-
-#if defined(HEADER_RC2_H) && !defined(RC2_INT)
-/* I need to put in a mod for the alpha - eay */
-#define RC2_INT unsigned int
-#endif
-
-#if defined(HEADER_RC4_H)
-#if !defined(RC4_INT)
-/* using int types make the structure larger but make the code faster
- * on most boxes I have tested - up to %20 faster. */
-/*
- * I don't know what does "most" mean, but declaring "int" is a must on:
- * - Intel P6 because partial register stalls are very expensive;
- * - elder Alpha because it lacks byte load/store instructions;
- */
-#define RC4_INT unsigned int
-#endif
-#if !defined(RC4_CHUNK)
-/*
- * This enables code handling data aligned at natural CPU word
- * boundary. See crypto/rc4/rc4_enc.c for further details.
- */
-#undef RC4_CHUNK
-#endif
-#endif
-
-#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
-/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
- * %20 speed up (longs are 8 bytes, int's are 4). */
-#ifndef DES_LONG
-#define DES_LONG unsigned int
-#endif
-#endif
-
-#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
-#define CONFIG_HEADER_BN_H
-#undef BN_LLONG
-
-/* Should we define BN_DIV2W here? */
-
-/* Only one for the following should be defined */
-/* The prime number generation stuff may not work when
- * EIGHT_BIT but I don't care since I've only used this mode
- * for debuging the bignum libraries */
-#define SIXTY_FOUR_BIT_LONG
-#undef SIXTY_FOUR_BIT
-#undef THIRTY_TWO_BIT
-#undef SIXTEEN_BIT
-#undef EIGHT_BIT
-#endif
-
-#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
-#define CONFIG_HEADER_RC4_LOCL_H
-/* if this is defined data[i] is used instead of *data, this is a %20
- * speedup on x86 */
-#define RC4_INDEX
-#endif
-
-#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
-#define CONFIG_HEADER_BF_LOCL_H
-#undef BF_PTR
-#endif /* HEADER_BF_LOCL_H */
-
-#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
-#define CONFIG_HEADER_DES_LOCL_H
-#ifndef DES_DEFAULT_OPTIONS
-/* the following is tweaked from a config script, that is why it is a
- * protected undef/define */
-#ifndef DES_PTR
-#undef DES_PTR
-#endif
-
-/* This helps C compiler generate the correct code for multiple functional
- * units.  It reduces register dependancies at the expense of 2 more
- * registers */
-#ifndef DES_RISC1
-#define DES_RISC1
-#endif
-
-#ifndef DES_RISC2
-#undef DES_RISC2
-#endif
-
-#if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
-#endif
-
-/* Unroll the inner loop, this sometimes helps, sometimes hinders.
- * Very mucy CPU dependant */
-#ifndef DES_UNROLL
-#define DES_UNROLL
-#endif
-
-/* These default values were supplied by
- * Peter Gutman <pgut001@cs.auckland.ac.nz>
- * They are only used if nothing else has been defined */
-#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
-/* Special defines which change the way the code is built depending on the
-   CPU and OS.  For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
-   even newer MIPS CPU's, but at the moment one size fits all for
-   optimization options.  Older Sparc's work better with only UNROLL, but
-   there's no way to tell at compile time what it is you're running on */
- 
-#if defined( sun )		/* Newer Sparc's */
-#  define DES_PTR
-#  define DES_RISC1
-#  define DES_UNROLL
-#elif defined( __ultrix )	/* Older MIPS */
-#  define DES_PTR
-#  define DES_RISC2
-#  define DES_UNROLL
-#elif defined( __osf1__ )	/* Alpha */
-#  define DES_PTR
-#  define DES_RISC2
-#elif defined ( _AIX )		/* RS6000 */
-  /* Unknown */
-#elif defined( __hpux )		/* HP-PA */
-  /* Unknown */
-#elif defined( __aux )		/* 68K */
-  /* Unknown */
-#elif defined( __dgux )		/* 88K (but P6 in latest boxes) */
-#  define DES_UNROLL
-#elif defined( __sgi )		/* Newer MIPS */
-#  define DES_PTR
-#  define DES_RISC2
-#  define DES_UNROLL
-#elif defined(i386) || defined(__i386__)	/* x86 boxes, should be gcc */
-#  define DES_PTR
-#  define DES_RISC1
-#  define DES_UNROLL
-#endif /* Systems-specific speed defines */
-#endif
-
-#endif /* DES_DEFAULT_OPTIONS */
-#endif /* HEADER_DES_LOCL_H */