diff --git a/src/etc/etc.hppa64/MAKEDEV.md b/src/etc/etc.hppa64/MAKEDEV.md
new file mode 100644
index 00000000..43608809
--- /dev/null
+++ b/src/etc/etc.hppa64/MAKEDEV.md
@@ -0,0 +1,104 @@
+vers(__file__,
+	{-$OpenBSD: MAKEDEV.md,v 1.1 2005/04/01 16:02:16 deraadt Exp $-},
+etc.MACHINE)dnl
+dnl
+dnl Copyright (c) 2001-2004 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(ccd, 7, 1)
+_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(wscons)
+_DEV(wsdisp, 27)
+_DEV(wskbd, 28)
+_DEV(wsmux, 30)
+_TITLE(point)
+_DEV(wsmouse, 29)
+_TITLE(prn)
+_DEV(lpt, 30)
+_TITLE(spec)
+_DEV(au, 35)
+_DEV(bpf, 17)
+_DEV(cry, 36)
+_DEV(fdesc, 16)
+_DEV(lkm, 19)
+_DEV(pci, 31)
+_DEV(pdc, 22)
+_DEV(pf, 21)
+_DEV(rnd, 20)
+_DEV(ses, 37)
+_DEV(ss, 14)
+_DEV(systrace, 34)
+_DEV(tun, 18)
+_DEV(uk, 15)
+_DEV(xfs, 32)
+dnl
+divert(__mddivert)dnl
+dnl
+ramdisk)
+	_recurse std fd st0 st1 sd0 sd1 sd2 sd3 rd0
+	_recurse pty0 bpf0 bpf1 tun0 tun1 lkm random
+	;;
+
+_std(1, 2, 25, 3, 6)
+	M pdc		c 22 0 640 operator
+	;;
+dnl
+dnl *** hppa64 specific devices
+dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)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, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 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)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
+target(ramd, st, 0, 1)dnl
+target(ramd, sd, 0, 1, 2, 3)dnl
+target(ramd, rd, 0, 1)dnl
+target(ramd, pty, 0)dnl
+target(ramd, hil)dnl
+target(ramd, com, 0, 1)dnl
+target(ramd, bpf, 0, 1)dnl
+target(ramd, tun, 0, 1)dnl
diff --git a/src/etc/etc.hppa64/Makefile.inc b/src/etc/etc.hppa64/Makefile.inc
new file mode 100644
index 00000000..72f9b10c
--- /dev/null
+++ b/src/etc/etc.hppa64/Makefile.inc
@@ -0,0 +1,18 @@
+#	$OpenBSD: Makefile.inc,v 1.1 2005/04/01 16:02:16 deraadt Exp $
+
+.ifdef DESTDIR
+snap_md: boot bsd distrib
+	cp ${.CURDIR}/../sys/arch/hppa64/compile/GENERIC/bsd \
+	    ${DESTDIR}/snapshot/bsd
+
+bsd:
+	cd ${.CURDIR}/../sys/arch/hppa64/conf && config GENERIC
+	cd ${.CURDIR}/../sys/arch/hppa64/compile/GENERIC && \
+	    ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
+
+boot:
+	cp ${DESTDIR}/usr/mdec/xxboot ${DESTDIR}/snapshot
+
+.PHONY: bsd
+
+.endif	# DESTDIR check
diff --git a/src/etc/etc.hppa64/disktab b/src/etc/etc.hppa64/disktab
new file mode 100644
index 00000000..aa5750e3
--- /dev/null
+++ b/src/etc/etc.hppa64/disktab
@@ -0,0 +1,34 @@
+#	$OpenBSD: disktab,v 1.1 2005/04/01 16:02:16 deraadt Exp $
+#
+#	@(#)disktab	5.5 (Berkeley) 2/27/91
+#
+# Disk geometry and partition layout tables.
+# Key:
+#	ty	type of disk
+#	ns	#sectors/track
+#	nt	#tracks/cylinder
+#	nc	#cylinders/disk
+#	rm	rpm, 3600 default
+#	se	sector size, 512 default
+#	sf	supports bad144-style bad sector forwarding
+#	so	partition offsets in sectors
+#	p[a-p]	partition sizes in sectors
+#	b[a-p]	partition block sizes in bytes
+#	f[a-p]	partition fragment sizes in bytes
+#
+# All partition sizes contain space
+# for bad sector tables unless the
+# device drivers fail to support this.
+#
+# Entries may also be used for other compatible drives
+# with the same geometry.
+
+rdroot|ramdiskroot|RAM-disk root FS image:\
+	:ty=simulated: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:
+
+fakecdrom|Fake image for Bootable CDROM:\
+	:ty=removable:se#512:nt#1:rm#350:ns#640:nc#2048:\
+	:pa#1310720:oa#0:ba#8192:fa#1024:ta=ISO9660:\
+	:pc#1310720:oc#0:bc#8192:fc#1024:tc=ISO9660:
diff --git a/src/etc/etc.hppa64/fbtab b/src/etc/etc.hppa64/fbtab
new file mode 100644
index 00000000..d0c58313
--- /dev/null
+++ b/src/etc/etc.hppa64/fbtab
@@ -0,0 +1 @@
+/dev/console	0600	/dev/ttyC0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg
diff --git a/src/etc/etc.hppa64/sysctl.conf b/src/etc/etc.hppa64/sysctl.conf
new file mode 100644
index 00000000..2ed7ae6a
--- /dev/null
+++ b/src/etc/etc.hppa64/sysctl.conf
@@ -0,0 +1,2 @@
+#kern.emul.hpux=1		# enable running HP/UX binaries
+#kern.emul.linux=1		# enable running Linux binaries
diff --git a/src/etc/etc.hppa64/ttys b/src/etc/etc.hppa64/ttys
new file mode 100644
index 00000000..3a305765
--- /dev/null
+++ b/src/etc/etc.hppa64/ttys
@@ -0,0 +1,18 @@
+#
+#	$OpenBSD: ttys,v 1.1 2005/04/01 16:02:16 deraadt Exp $
+#
+# name	getty				type	status		comments
+#
+# If the console is marked insecure, single-user requires
+# the root password.
+console "/usr/libexec/getty Pc"		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