diff --git a/src/etc/etc.octeon/MAKEDEV b/src/etc/etc.octeon/MAKEDEV
new file mode 100644
index 00000000..710e7dbc
--- /dev/null
+++ b/src/etc/etc.octeon/MAKEDEV
@@ -0,0 +1,441 @@
+#!/bin/sh -
+#
+# THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
+# generated from:
+#
+#	$OpenBSD: MAKEDEV,v 1.1 2013/03/26 17:58:11 jasper Exp $
+#	OpenBSD: MAKEDEV.common,v 1.62 2013/03/15 09:10:52 ratchov Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper 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
+#	rd*	"rd" pseudo-disks
+#	sd*	SCSI disks, including flopticals
+#	vnd*	"file" pseudo-disk devices
+#	wd*	"winchester" disk drives (ST506, IDE, ESDI, RLL, ...)
+#	octcf*	octeon compact flash
+# 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
+# USB devices:
+#	ttyU*	USB serial ports
+# Special purpose devices:
+#	audio*	Audio devices
+#	bio	ioctl tunnel pseudo-device
+#	bpf*	Berkeley Packet Filter
+#	crypto	Hardware crypto access driver
+#	diskmap	Disk mapper
+#	fd	fd/* nodes
+#	hotplug	devices hot plugging
+#	pci*	PCI bus devices
+#	pf*	Packet Filter
+#	pppx*	PPP Multiplexer
+#	*random	In-kernel random data source
+#	systrace*	System call tracing device
+#	tun*	Network 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[${#mklist[*]}]=";mknod -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
+std)
+	M console	c 0 0 600
+	M tty		c 2 0
+	M mem		c 3 0 640 kmem
+	M kmem		c 3 1 640 kmem
+	M null		c 3 2
+	M zero		c 3 12
+	M stdin		c 7 0
+	M stdout	c 7 1
+	M stderr	c 7 2
+	M ksyms		c 35 0 640 kmem
+	M klog		c 6 0 600
+	;;
+
+vscsi*)
+	M vscsi$U c 68 $U 600
+	;;
+
+video*)
+	M video$U  c 45 $U
+	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
+	;;
+
+uk*)
+	M uk$U c 32 $U 640 operator
+	;;
+
+tun*)
+	M tun$U c 13 $U 600
+	;;
+
+systrace)
+	M systrace c 50 0 644
+	;;
+
+*random)
+	n=0
+	for pre in " " s u a
+	do
+		M ${pre}random c 33 $n 644
+		n=$(($n+1))
+	done
+	;;
+
+pppx*)
+	M pppx$U c 70 $U 600
+	;;
+
+pf*)
+	M pf c 31 0 600
+	;;
+
+pci*)
+	M pci$U	c 29 $U 600
+	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
+	;;
+
+hotplug)
+	M hotplug c 67 $U 400
+	;;
+
+fd)
+	RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
+	while [ $n -lt 64 ];do M fd/$n c 7 $n;n=$(($n+1));done
+	MKlist[${#MKlist[*]}]=";chmod 555 fd"
+	;;
+
+diskmap)
+	M diskmap c 69 0 640 operator
+	;;
+
+crypto)
+	M crypto c 47 0
+	;;
+
+bpf*)
+	M bpf$U c 12 $U 600
+	;;
+
+bio)
+	M bio c 49 0 600
+	;;
+
+audio*)
+	M sound$U	c 44 $U
+	M mixer$U	c 44 $(($U+16))
+	M audio$U	c 44 $(($U+128))
+	M audioctl$U	c 44 $(($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 66 $o 660 dialer uucp
+	M cuaU$U c 66 $(($o+128)) 660 dialer uucp
+	;;
+
+wsmouse[0-9]*)
+	M wsmouse$U c 27 $U 600
+	;;
+
+wsmux|wsmouse|wskbd)
+	M wsmouse c 28 0 600
+	M wskbd c 28 1 600
+	;;
+
+wskbd[0-9]*)
+	M wskbd$U c 26 $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 25 $((16#$U+$m)) 600;;
+	cfg) M tty${n}cfg c 25 $((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 52 0 666
+	;;
+
+tty[0-7][0-9a-f])
+	U=${i#tty*}
+	o=$(h2d $U)
+	M tty$U c 17 $o 660 dialer uucp
+	M cua$U c 17 $(($o+128)) 660 dialer uucp
+	;;
+
+st*)
+	n=$(($U*16))
+	for pre in " " n e en
+	do
+		M ${pre}st$U	b 10 $n 660 operator
+		M ${pre}rst$U	c 10 $n 660 operator
+		n=$(($n+1))
+	done
+	;;
+
+ch*)
+	M ch$U c 36 $U 660 operator
+	;;
+
+vnd*)
+	dodisk vnd $U 2 11 $U 0
+	;;
+
+rd*)
+	dodisk2 rd $U 8 22 $U 0
+	;;
+
+cd*)
+	dodisk2 cd $U 3 8 $U 0
+	;;
+
+local)
+	test -s $T.local && sh $T.local
+	;;
+
+ramdisk)
+	R octcf0 diskmap bio pty0 rd0 cd0 cd1 st0 st1 wd0 wd1 wd2 wd3
+	R wd4 sd0 sd1 sd2 sd3 sd4 tty00 tty01 bpf0 std
+	;;
+
+all)
+	R octcf0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7
+	R sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2
+	R bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 diskmap
+	R vscsi0 ch0 audio0 audio1 audio2 pppx hotplug ptm local
+	R wscons pci0 pci1 pci2 pci3 video0 video1 uk0 random tty00
+	R tty01 tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0
+	R st1 fd
+	;;
+
+octcf*|wd*|sd*)
+	case $i in
+	octcf*) dodisk octcf $U 15 15 $U 0;;
+	wd*) dodisk wd $U 4 18 $U 0;;
+	sd*) dodisk sd $U 0 9 $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.octeon/MAKEDEV.md b/src/etc/etc.octeon/MAKEDEV.md
new file mode 100644
index 00000000..41a9448f
--- /dev/null
+++ b/src/etc/etc.octeon/MAKEDEV.md
@@ -0,0 +1,108 @@
+define(MACHINE,octeon)dnl
+vers(__file__,
+	{-$OpenBSD: MAKEDEV.md,v 1.1 2013/03/26 17:58:11 jasper Exp $-},
+etc.MACHINE)dnl
+dnl
+dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
+dnl All rights reserved.
+dnl
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted provided that the following conditions
+dnl are met:
+dnl 1. Redistributions of source code must retain the above copyright
+dnl    notice, this list of conditions and the following disclaimer.
+dnl 2. The name of the author may not be used to endorse or promote products
+dnl    derived from this software without specific prior written permission.
+dnl
+dnl THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+dnl AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+dnl THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+dnl EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+dnl PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+dnl OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+dnl WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+dnl ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+dnl
+dnl
+dnl *** octeon specific devices
+__devitem(uar, ttya, on-board serial port,uar)dnl
+__devitem(octcf, {-octcf*-}, octeon compact flash)dnl
+disk_q({-octcf-})dnl
+dnl
+dnl *** MAKEDEV itself
+dnl
+_TITLE(make)
+_DEV(all)
+_DEV(ramd)
+_DEV(std)
+_DEV(local)
+_TITLE(dis)
+_DEV(cd, 8, 3)
+_DEV(rd, 22, 8)
+_DEV(sd, 9, 0)
+_DEV(vnd, 11, 2)
+_DEV(wd, 18, 4)
+_DEV(octcf, 15, 15)
+_TITLE(tap)
+_DEV(ch, 36)
+_DEV(st, 10, 10)
+_TITLE(term)
+_DEV(com, 17)
+_TITLE(pty)
+_DEV(ptm, 52)
+_DEV(pty, 5)
+_DEV(tty, 4)
+_TITLE(cons)
+_DEV(wsdisp, 25)
+_DEV(wscons)
+_DEV(wskbd, 26)
+_DEV(wsmux, 28)
+_TITLE(point)
+_DEV(wsmouse, 27)
+_TITLE(usb)
+_DEV(ttyU, 66)
+_TITLE(spec)
+_DEV(au, 44)
+_DEV(bio, 49)
+_DEV(bpf, 12)
+_DEV(cry, 47)
+_DEV(diskmap, 69)
+_DEV(fdesc, 7)
+_DEV(hotplug, 67)
+dnl _DEV(lkm)
+_DEV(pci, 29)
+_DEV(pf, 31)
+_DEV(pppx, 70)
+_DEV(rnd, 33)
+_DEV(systrace, 50)
+_DEV(tun, 13)
+_DEV(uk, 32)
+_DEV(vi, 45)
+_DEV(vscsi, 68)
+dnl
+divert(__mddivert)dnl
+dnl
+_std(2, 3, 35, 6)
+	;;
+dnl
+dnl *** octeon specific targets
+dnl
+twrget(all, au, audio, 0, 1, 2)dnl
+target(all, ch, 0)dnl
+target(all, vscsi, 0)dnl
+target(all, diskmap)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, bio)dnl
+target(all, tun, 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(all, octcf, 0)dnl
+target(ramd, pty, 0)dnl
+target(ramd, bio)dnl
+target(ramd, diskmap)dnl
+target(ramd, octcf, 0)dnl
diff --git a/src/etc/etc.octeon/Makefile b/src/etc/etc.octeon/Makefile
new file mode 100644
index 00000000..c3b9c350
--- /dev/null
+++ b/src/etc/etc.octeon/Makefile
@@ -0,0 +1,5 @@
+#	$OpenBSD: Makefile,v 1.1 2013/03/26 17:58:11 jasper Exp $
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>
diff --git a/src/etc/etc.octeon/Makefile.inc b/src/etc/etc.octeon/Makefile.inc
new file mode 100644
index 00000000..c5e33757
--- /dev/null
+++ b/src/etc/etc.octeon/Makefile.inc
@@ -0,0 +1,6 @@
+#	$OpenBSD: Makefile.inc,v 1.1 2013/03/26 17:58:11 jasper Exp $
+
+bootblocks:
+	cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}/boot
+
+MDEXT=	bsd.rd
diff --git a/src/etc/etc.octeon/disktab b/src/etc/etc.octeon/disktab
new file mode 100644
index 00000000..77a325ad
--- /dev/null
+++ b/src/etc/etc.octeon/disktab
@@ -0,0 +1,11 @@
+# $OpenBSD: disktab,v 1.1 2013/03/26 17:58:11 jasper Exp $
+
+rdroot|ramdiskroot|RAM-disk root FS image:\
+	:ty=simulated:se#512:nc#20:nt#4:ns#128:\
+	:ta=4.2BSD:oa#0:pa#10240:fa#512:ba#4096:\
+	:ob#0:pb#0:oc#0:pc#10240:
+
+minicdroot|minicdramdiskroot|Boot CD-ROM image:\
+	:ty=simulated:se#512:nc#48:nt#4:ns#128:\
+	:ta=4.2BSD:oa#0:pa#24576:fa#512:ba#4096:\
+	:ob#0:pb#0:oc#0:pc#24576:
diff --git a/src/etc/etc.octeon/fbtab b/src/etc/etc.octeon/fbtab
new file mode 100644
index 00000000..97f474b2
--- /dev/null
+++ b/src/etc/etc.octeon/fbtab
@@ -0,0 +1,3 @@
+/dev/tty00	0600	/dev/console
+/dev/ttyC0	0600	/dev/console:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg
+/dev/X0		0600	/dev/wsmouse:/dev/wsmouse0:/dev/wskbd:/dev/wskbd0:/dev/ttyC0
diff --git a/src/etc/etc.octeon/sysctl.conf b/src/etc/etc.octeon/sysctl.conf
new file mode 100644
index 00000000..e69de29b
diff --git a/src/etc/etc.octeon/ttys b/src/etc/etc.octeon/ttys
new file mode 100644
index 00000000..a0e9f706
--- /dev/null
+++ b/src/etc/etc.octeon/ttys
@@ -0,0 +1,13 @@
+#
+#	$OpenBSD: ttys,v 1.1 2013/03/26 17:58:11 jasper Exp $
+#
+# name	getty				type	status		comments
+#
+console	"/usr/libexec/getty std.9600"	vt220	on  secure
+# wsdisplay(4) glass console
+ttyC0	"/usr/libexec/getty std.9600"	vt220	off secure
+# com(4) serial ports
+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