diff --git a/src/etc/etc.amd64/MAKEDEV.md b/src/etc/etc.amd64/MAKEDEV.md
new file mode 100644
index 00000000..0d86b8d8
--- /dev/null
+++ b/src/etc/etc.amd64/MAKEDEV.md
@@ -0,0 +1,148 @@
+vers(__file__,
+	{-$OpenBSD: MAKEDEV.md,v 1.1 2004/01/28 02:11:53 mickey Exp $-},
+etc.MACHINE)dnl
+dnl
+dnl Copyright (c) 2001,2002,2003 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(loc)
+_TITLE(tap)
+_DEV(wt, 10, 3)
+_DEV(st, 14, 5)
+_DEV(ch, 17)
+_TITLE(dis)
+_DEV(wd, 3, 0)
+_DEV(flo, 9, 2)
+_DEV(sd, 13, 4)
+_DEV(cd, 15, 6)
+_DEV(mcd, 39, 7)
+_DEV(vnd, 41, 14)
+_DEV(rd, 47, 17)
+_DEV(ccd, 18, 16)
+_DEV(raid, 54, 19)
+_TITLE(cons)
+_DEV(wscons)
+_DEV(wsdisp, 12)
+_DEV(wskbd, 67)
+_DEV(wsmux, 69)
+_TITLE(point)
+_DEV(mouse)
+_DEV(wsmouse, 68)
+_TITLE(term)
+_DEV(com, 8)
+_DEV(ttyc, 38)
+_TITLE(pty)
+_DEV(tty, 5)
+_DEV(pty, 6)
+_TITLE(prn)
+_DEV(lpt, 16)
+_DEV(lpa)
+_TITLE(usb)
+_DEV(usb, 61)
+_DEV(uhid, 62)
+_DEV(ugen, 63)
+_DEV(ulpt, 64)
+_DEV(urio, 65)
+_DEV(ttyU, 66)
+_DEV(uscan, 77)
+_TITLE(call)
+_TITLE(spec)
+_DEV(fdesc, 22)
+_DEV(cry, 70)
+_DEV(pf, 73)
+_DEV(bpf, 23)
+_DEV(speak, 27)
+_DEV(lkm, 28)
+_DEV(au, 42)
+_DEV(rmidi, 52)
+_DEV(music, 53)
+_DEV(apm, 21)
+_DEV(tun, 40)
+_DEV(joy, 26)
+_DEV(pcmcia)
+_DEV(rnd, 45)
+_DEV(uk, 20)
+_DEV(ss, 19)
+_DEV(ses, 24)
+_DEV(xfs, 51)
+_DEV(bktr, 49)
+_DEV(tuner, 49)
+_DEV(wdt, 55)
+_DEV(pctr, 46)
+_DEV(pci, 72)
+_DEV(iop, 75)
+_DEV(radio, 76)
+_DEV(systrace, 78)
+_DEV(gpr, 80)
+_DEV({-usbs-})
+#
+dnl
+divert(7)dnl
+dnl
+ramdisk)
+	_recurse std bpf0 fd0 wd0 wd1 wd2 sd0 sd1 sd2 tty00 tty01 rd0
+	_recurse st0 cd0 ttyC0 random wskbd0
+	;;
+
+_std(1, 2, 50, 4, 7)
+	M xf86		c 2 4 600
+	;;
+
+ttyc*)
+	M ttyc$U c 38 $U 660 dialer uucp
+	M cuac$U c 38 Add($U, 128) 660 dialer uucp
+	;;
+
+mouse*)
+	name=${i##mouse-}
+	if [ ! -c $name ]; then
+		$0 $name	# make the appropriate device
+	fi
+	RMlist="$RMlist mouse"
+	MKlist="$MKlist;ln -s $name mouse"
+	;;
+dnl
+dnl i386 specific targets
+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, 1, 2)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(all, bktr, 0)dnl
+target(ramd, tty0, 0, 1, 2, 3)dnl
+twrget(ramd, wsdisp, ttyC, 0)dnl
+target(ramd, wt, 0)dnl
+target(ramd, fd, 0)dnl
+target(ramd, rd, 0)dnl
+target(ramd, wd, 0, 1, 2, 3)dnl
+target(ramd, sd, 0, 1, 2, 3)dnl
+target(ramd, cd, 0, 1)dnl
+target(ramd, st, 0, 1)dnl
+target(ramd, mcd, 0)dnl
diff --git a/src/etc/etc.amd64/Makefile.inc b/src/etc/etc.amd64/Makefile.inc
new file mode 100644
index 00000000..5fa656bc
--- /dev/null
+++ b/src/etc/etc.amd64/Makefile.inc
@@ -0,0 +1,18 @@
+#	$OpenBSD: Makefile.inc,v 1.1 2004/01/28 02:11:53 mickey Exp $
+
+.ifdef DESTDIR
+snap_md: boot bsd distrib
+	cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC/bsd \
+	    ${DESTDIR}/snapshot/bsd
+
+bsd:
+	cd ${.CURDIR}/../sys/arch/amd64/conf && config GENERIC
+	cd ${.CURDIR}/../sys/arch/amd64/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.amd64/disktab b/src/etc/etc.amd64/disktab
new file mode 100644
index 00000000..4a0fb7c8
--- /dev/null
+++ b/src/etc/etc.amd64/disktab
@@ -0,0 +1,132 @@
+#	$OpenBSD: disktab,v 1.1 2004/01/28 02:11:53 mickey Exp $
+
+# Disk geometry and partition layout tables.
+# Key:
+#	dt	controller type
+#	ty	type of disk (fixed, removeable, simulated)
+#	d[0-4]	drive-type-dependent parameters
+#	ns	#sectors/track
+#	nt	#tracks/cylinder
+#	nc	#cylinders/disk
+#	sc	#sectors/cylinder, ns*nt default
+#	su	#sectors/unit, sc*nc default
+#	se	sector size, DEV_BSIZE default
+#	rm	rpm, 3600 default
+#	sf	supports bad144-style bad sector forwarding
+#	sk	sector skew per track, default 0
+#	cs	sector skew per cylinder, default 0
+#	hs	headswitch time, default 0
+#	ts	one-cylinder seek time, default 0
+#	il	sector interleave (n:1), 1 default
+#	bs	boot block size, default BBSIZE
+#	sb	superblock size, default SBSIZE
+#	o[a-p]	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
+#	t[a-p]	partition types (filesystem, swap, etc)
+#
+# All partition sizes reserve space for bad sector tables.
+# (5 cylinders needed for maintenance + replacement sectors)
+#
+
+qp120at|Quantum Peripherals 120MB IDE:\
+	:dt=ESDI:ty=winchester:se#512:nt#9:ns#32:nc#813:sf: \
+	:pa#13824:oa#0:ta=4.2BSD:ba#4096:fa#512: \
+	:pb#13824:ob#13824:tb=swap: \
+	:pc#234144:oc#0: \
+	:ph#206496:oh#27648:th=4.2BSD:bh#4096:fh#512:
+
+pan60|Panasonic Laptop's 60MB IDE:\
+	:dt=ST506:ty=winchester:se#512:nt#13:ns#17:nc#565:\
+	:pa#13260:oa#0:ta=4.2BSD:ba#4096:fa#512:\
+	:pb#13260:ob#13260:tb=swap: \
+	:pc#124865:oc#0: \
+	:ph#97682:oh#26520:th=4.2BSD:bh#4096:fh#512:
+
+mk156|toshiba156|Toshiba MK156 156Mb:\
+	:dt=SCSI:ty=winchester:se#512:nt#10:ns#35:nc#825:\
+	:pa#15748:oa#0:ba#4096:fa#512:ta=4.2BSD:\
+	:pb#15748:ob#15748:tb=swap:\
+        :pc#288750:oc#0:\
+	:ph#257250:oh#31500:bh#4096:fh#512:th=4.2BSD:	
+
+cp3100|Conner Peripherals 100MB IDE:\
+	:dt=ST506:ty=winchester:se#512:nt#8:ns#33:nc#766: \
+	:pa#12144:oa#0:ta=4.2BSD:ba#4096:fa#512: \
+	:pb#12144:ob#12144:tb=swap: \
+	:pc#202224:oc#0: \
+	:ph#177936:oh#24288:th=4.2BSD:bh#4096:fh#512:
+
+# a == root
+# b == swap
+# c == whole disk
+# e == /var
+# f == scratch
+# h == /usr
+
+cp3100new|Conner Peripherals 100MB IDE, with a different configuration:\
+	:dt=ST506:ty=winchester:se#512:nt#8:ns#33:nc#766: \
+	:pa#15840:oa#0:ta=4.2BSD:ba#4096:fa#512: \
+	:pb#24288:ob#15840:tb=swap: \
+	:pc#202224:oc#0: \
+	:pe#15840:oe#40128:te=4.2BSD:be#4096:fe#512: \
+	:pg#15840:og#55968:tg=4.2BSD:bg#4096:fg#512: \
+	:ph#130416:oh#71808:th=4.2BSD:bh#4096:fh#512:
+
+floppy288|3in|3.5in High Density Floppy, 2.88MB:\
+	:dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#36:nc#80:\
+	:pa#5760:oa#0:ba#4096:fa#512:ta=4.2BSD: \
+	:pb#5760:ob#0:\
+	:pc#5760:oc#0:
+
+floppy|floppy3|3in|3.5in High Density Floppy:\
+	:dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
+	:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD: \
+	:pb#2880:ob#0:\
+	:pc#2880:oc#0:
+
+floppy5|5in|5.25in High Density Floppy:\
+	:dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#15:nc#80:\
+	:pa#2400:oa#0:ba#4096:fa#512:ta=4.2BSD: \
+	:pb#2400:ob#0:bb#4096:fb#512:\
+	:pc#2400:oc#0:bc#4096:fc#512:
+
+maxtor4380|Maxtor XT4380E ESDI :\
+	:dt=ESDI:ty=winchester:se#512:nt#15:ns#36:nc#1222:sf: \
+	:pa#21600:oa#0:ta=4.2BSD:ba#4096:\
+	:pb#21600:ob#21600:tb=swap: \
+	:pc#659880:oc#0: \
+	:pe#216000:oe#53200:te=4.2BSD:be#4096:fe#512: \
+	:ph#398520:oh#269200:th=4.2BSD:bh#4096:fh#512:
+
+miniscribe9380|compaq38|Miniscribe 9380 ESDI :\
+	:ty=winchester:dt=ESDI:se#512:nt#15:ns#35:nc#1223:rm#3600:sf: \
+	:pa#21000:oa#0:ba#8192:fa#1024:ta=4.2BSD: \
+	:pb#42000:ob#21000:tb=swap: \
+	:pc#642075:oc#0: \
+	:pe#21000:oe#63000:be#8192:fe#1024:te=4.2BSD: \
+	:ph#556500:oh#84000:bh#8192:fh#1024:th=4.2BSD:
+
+ida4|compaq88|Compaq IDA (4 drives) :\
+	:ty=winchester:dt=IDA:se#512:nt#16:ns#63:nc#1644:rm#3600:\
+	:pa#20160:oa#0:ba#8192:fa#1024:ta=4.2BSD: \
+	:pb#80640:ob#20160:tb=swap: \
+	:pc#1659168:oc#0: \
+	:pe#201600:oe#100800:be#8192:fe#1024:te=4.2BSD: \
+	:pf#20160:of#1310400:bf#8192:ff#1024:tf=4.2BSD: \
+	:ph#1008000:oh#302400:bh#8192:fh#1024:th=4.2BSD: \
+	:pg#302400:og#1330560:bg#4096:fg#512:tg=4.2BSD:
+
+fuji513|Fujitsu M22XXXX: \
+	:ty=winchester:dt=ESDI:se#512:nt#16:ns#63:nc#954:rm#3600:\
+	:pa#20160:oa#82656:ba#4096:fa#512:ta=4.2BSD: \
+	:pb#40320:ob#102816:tb=swap: \
+	:pc#961632:oc#0: \
+	:ph#656208:oh#143136:bh#4096:fh#512:th=4.2BSD:
+
+rdroot|ramdiskroot|RAM-disk root FS image:\
+	:ty=ramdisk:se#512:nt#2:ns#128:nc#16:\
+	:pa#3510:oa#0:ta=4.2BSD:ba#4096:fa#512:\
+	:pb#0:ob#0:tb=swap:\
+	:pc#3510:oc#0:
diff --git a/src/etc/etc.amd64/fbtab b/src/etc/etc.amd64/fbtab
new file mode 100644
index 00000000..2dbac87c
--- /dev/null
+++ b/src/etc/etc.amd64/fbtab
@@ -0,0 +1,2 @@
+/dev/ttyC0	0600	/dev/console:/dev/wskbd:/dev/wsmouse:/dev/ttyCcfg
+/dev/X0		0600	/dev/wsmouse
diff --git a/src/etc/etc.amd64/sysctl.conf b/src/etc/etc.amd64/sysctl.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/src/etc/etc.amd64/ttys b/src/etc/etc.amd64/ttys
new file mode 100644
index 00000000..b86882bc
--- /dev/null
+++ b/src/etc/etc.amd64/ttys
@@ -0,0 +1,26 @@
+#
+#	$OpenBSD: ttys,v 1.1 2004/01/28 02:11:53 mickey Exp $
+#
+# name	getty				type	status		comments
+#
+console	"/usr/libexec/getty Pc"		vt220	off secure
+ttyC0	"/usr/libexec/getty Pc"		vt220	on  secure
+ttyC1	"/usr/libexec/getty Pc"		vt220	on  secure
+ttyC2	"/usr/libexec/getty Pc"		vt220	on  secure
+ttyC3	"/usr/libexec/getty Pc"		vt220	on  secure
+ttyC4	"/usr/libexec/getty Pc"		vt220	off secure
+ttyC5	"/usr/libexec/getty Pc"		vt220	on  secure
+ttyC6	"/usr/libexec/getty Pc"		vt220	off secure
+ttyC7	"/usr/libexec/getty Pc"		vt220	off secure
+ttyC8	"/usr/libexec/getty Pc"		vt220	off secure
+ttyC9	"/usr/libexec/getty Pc"		vt220	off secure
+ttyCa	"/usr/libexec/getty Pc"		vt220	off secure
+ttyCb	"/usr/libexec/getty Pc"		vt220	off secure
+tty00	"/usr/libexec/getty std.9600"	unknown off
+tty01	"/usr/libexec/getty std.9600"	unknown off
+tty02	"/usr/libexec/getty std.9600"	unknown off
+tty03	"/usr/libexec/getty std.9600"	unknown off
+tty04	"/usr/libexec/getty std.9600"	unknown off
+tty05	"/usr/libexec/getty std.9600"	unknown off
+tty06	"/usr/libexec/getty std.9600"	unknown off
+tty07	"/usr/libexec/getty std.9600"	unknown off