diff --git a/core/linux-ox820/PKGBUILD b/core/linux-ox820/PKGBUILD
new file mode 100644
index 000000000..186d38f9d
--- /dev/null
+++ b/core/linux-ox820/PKGBUILD
@@ -0,0 +1,264 @@
+# Maintainer: WarheadsSE <max@warheads.net>
+# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
+
+buildarch=2
+noautobuild=1
+
+_mach=ox820
+_github_user=WarheadsSE
+_github_repo=OX820-2.6-linux
+_github_commitID=3ee8eaa0e19f2d1ff97ad9df8aa90b9d87456682
+pkgbase=linux-${_mach}
+pkgname=("linux-${_mach}" "linux-headers-${_mach}")
+# pkgname=linux-custom       # Build kernel with a different name
+_kernelname=${pkgname#linux}
+_basekernel=2.6
+pkgver=${_basekernel}.31
+pkgrel=0
+arch=('arm')
+url="http://www.kernel.org/"
+license=('GPL2')
+makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage')
+options=('!strip')
+source=("linux.tar.gz::https://github.com/${_github_user}/${_github_repo}/tarball/${_github_commitID}"
+        'ox820-to-nand.sh')
+md5sums=('439eda8081b15c2be077da2e63e3d792'
+         '4631c7251cb0d78989dacee31c2f1e6e')
+
+build() {
+  cd ${srcdir}
+  # the github-commit-tarball issue results in this, rename it sanely
+  mv "${_github_user}-${_github_repo}-${_github_commitID:0:7}" linux
+
+  cd linux
+
+  # add upstream patch
+  #patch -p1 -i "${srcdir}/patch-${pkgver}"
+
+  # add latest fixes from stable queue, if needed
+  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
+
+  # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
+  # remove this when a Kconfig knob is made available by upstream
+  # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
+  #patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
+
+  cat "${srcdir}/linux/config.nopci" > ./.config
+
+  # set extraversion to pkgrel
+  sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}-ARCH|" Makefile
+
+  # don't run depmod on 'make install'. We'll do this ourselves in packaging
+  # sed -i '2iexit 0' scripts/depmod.sh
+
+  # get kernel version
+  make prepare
+
+  # load configuration
+  # Configure the kernel. Replace the line below with one of your choice.
+  #make menuconfig # CLI menu for configuration
+  #make nconfig # new CLI menu for configuration
+  #make xconfig # X-based configuration
+  #make oldconfig # using old config from previous kernel version
+  # ... or manually edit .config
+
+  # Copy back our configuration (use with new kernel version)
+  #cp ./.config ../${pkgver}.config
+
+  ####################
+  # stop here
+  # this is useful to configure the kernel
+  #msg "Stopping build"
+  #return 1
+  ####################
+
+  #yes "" | make config
+
+  # build!
+  make ${MAKEFLAGS} modules uImage
+}
+
+package_linux-ox820() {
+  pkgdesc="The Linux Kernel and modules for PLX OX7820 SoC (non-PCI)"
+  depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16')
+  optdepends=('crda: to set the correct wireless channels of your country')
+  provides=("kernel26-${_mach}" "linux=${_mach}")
+  conflicts=('kernel26' 'linux')
+  replaces=('kernel26')
+  backup=("etc/mkinitcpio.d/${pkgname}.preset")
+  install=${pkgname}.install
+
+  cd "${srcdir}/linux"
+
+  KARCH=arm
+
+  # get kernel version
+  _kernver="$(make kernelrelease)"
+
+  mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
+  make INSTALL_MOD_PATH="${pkgdir}" modules_install
+  #cd arch/$KARCH/boot/
+
+  cd "${srcdir}/linux"
+  #cp arch/$KARCH/boot/kernel.img ${pkgdir}/boot/kernel.img
+  cp arch/$KARCH/boot/uImage "${pkgdir}/boot/uImage"
+
+  # copy over to-nand script
+  cp "${startdir}/ox820-to-nand.sh" "${pkgdir}/boot/ox820-to-nand.sh"
+
+  # set correct depmod command for install
+  sed \
+    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
+    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
+    -i  "${startdir}/${pkgname}.install"
+
+  # remove build and source links
+  rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
+  # remove the firmware
+  rm -rf "${pkgdir}/lib/firmware"
+  # gzip -9 all modules to save ~100MB of space
+  find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+  # make room for external modules
+  ln -s "../extramodules-${pkgver}-${_kernelname:-ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  # add real version for building modules and running depmod from post_install/upgrade
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${pkgver}-${_kernelname:-ARCH}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${pkgver}-${_kernelname:-ARCH}/version"
+
+  # Now we call depmod...
+  depmod -b "$pkgdir" -F System.map "$_kernver"
+
+  # move module tree /lib -> /usr/lib
+  mkdir -p "${pkgdir}/usr"
+  mv "$pkgdir/lib" "$pkgdir/usr"
+}
+
+package_linux-headers-ox820() {
+  pkgdesc="Header files and scripts for building modules for linux kernel for PLX OX7820 SoC"
+  provides=('kernel26-headers' "linux-headers=${pkgver}")
+  conflicts=('kernel26-headers')
+  replaces=('kernel26-headers')
+
+  KARCH=arm
+  install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
+
+  cd "${pkgdir}/usr/lib/modules/${_kernver}"
+  ln -sf ../../../src/linux-${_kernver} build
+
+  cd "${srcdir}/linux"
+  install -D -m644 Makefile \
+    "${pkgdir}/usr/src/linux-${_kernver}/Makefile"
+  install -D -m644 kernel/Makefile \
+    "${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile"
+  install -D -m644 .config \
+    "${pkgdir}/usr/src/linux-${_kernver}/.config"
+
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
+
+  for i in acpi asm-generic config crypto drm keys linux math-emu \
+    media mtd net pcmcia rxrpc scsi sound trace video xen; do
+    cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
+  done
+
+   # copy arch includes for external modules
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH
+  cp -a arch/$KARCH/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
+
+  ## YOUR MACH HERE, this is using the $_mach ##
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-${_mach}   
+  cp -a arch/$KARCH/mach-${_mach}/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-${_mach}/
+
+  # copy files necessary for later builds, like nvidia and vmware
+  cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
+  cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
+
+  # fix permissions on scripts dir
+  chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
+
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel"
+
+  cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+
+  if [ "${CARCH}" = "i686" ]; then
+    cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+  fi
+
+  cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
+
+  # add headers for lirc package
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video"
+
+  cp drivers/media/video/*.h  "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/"
+
+  for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do
+    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
+    cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
+  done
+
+  # add docbook makefile
+  install -D -m644 Documentation/DocBook/Makefile \
+    "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
+
+  # add dm headers
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
+  cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
+
+  # add inotify.h
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux"
+  cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/"
+
+  # add wireless headers
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
+  cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
+
+  # add dvb headers for external modules
+  # in reference to:
+  # http://bugs.archlinux.org/task/9912
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core"
+  cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/"
+  # and...
+  # http://bugs.archlinux.org/task/11194
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
+  cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
+
+  # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+  # in reference to:
+  # http://bugs.archlinux.org/task/13146
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
+  cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
+  cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
+
+  # add dvb headers
+  # in reference to:
+  # http://bugs.archlinux.org/task/20402
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb"
+  cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends"
+  cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners"
+  cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/"
+
+  # copy in Kconfig files
+  for i in `find . -name "Kconfig*"`; do
+    mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`
+    cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
+  done
+
+  chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
+  find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
+
+  # strip scripts directory
+  find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
+    case "$(file -bi "${binary}")" in
+      *application/x-sharedlib*) # Libraries (.so)
+        /usr/bin/strip ${STRIP_SHARED} "${binary}";;
+      *application/x-archive*) # Libraries (.a)
+        /usr/bin/strip ${STRIP_STATIC} "${binary}";;
+      *application/x-executable*) # Binaries
+        /usr/bin/strip ${STRIP_BINARIES} "${binary}";;
+    esac
+  done
+
+  # remove unneeded architectures
+  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,x86,xtensa}
+}
diff --git a/core/linux-ox820/linux-ox820.install b/core/linux-ox820/linux-ox820.install
new file mode 100644
index 000000000..eecce89d5
--- /dev/null
+++ b/core/linux-ox820/linux-ox820.install
@@ -0,0 +1,38 @@
+# arg 1:  the new package version
+# arg 2:  the old package version
+
+KERNEL_NAME=-ox820
+KERNEL_VERSION=2.6.31-1-ARCH
+
+post_install () {
+  # updating module dependencies
+  echo ">>> Updating module dependencies. Please wait ..."
+  depmod ${KERNEL_VERSION}
+  warn_them()
+}
+
+post_upgrade() {
+  if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then
+    if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then
+      echo "WARNING: /boot appears to be a seperate partition but is not mounted."
+      echo "         You probably just broke your system. Congratulations."
+    fi
+  fi
+
+  # updating module dependencies
+  echo ">>> Updating module dependencies. Please wait ..."
+  depmod ${KERNEL_VERSION}
+  warn_them()
+}
+
+warn_them() {
+  echo "!! Installing uImage !!"
+  echo "NOTICE: You must install /boot/uImage to your appropriate location."
+  echo "- For a Pogoplug V3 using NAND, this means running /boot/ox820-to-nand.sh'"
+  echo "  Use '/boot/ox820-to-nand.sh --slot-b' if your NAND slot A is bad/errors."
+  echo "- SATA boot systems, do as appropraite."
+  echo "  Most: dd if=/boot/uImage of=/dev/sda1"
+  echo "  Rare: /boot/uImage is enough."
+  echo "WARNING: This MUST be done successfully before rebooting!"
+
+}
diff --git a/core/linux-ox820/ox820-to-nand.sh b/core/linux-ox820/ox820-to-nand.sh
new file mode 100755
index 000000000..a417ce91b
--- /dev/null
+++ b/core/linux-ox820/ox820-to-nand.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+##########################################
+echo "# ox820 NAND kernel update."
+echo "# NOTE: This is configured for Pogoplug V3"
+echo ""
+TESTOX820=`cat /proc/cpuinfo | grep 'Oxsemi NAS'`
+
+if [  "$TESTOX820" = "" ]; then
+  echo "Not an OX820 board!"
+  exit;
+fi
+
+NSLOT=A
+NOFFSET="0x500000"
+if [ "$1" = "--slot-b" ]; then
+  NSLOT=B
+  NOFFSET="0xB00000"
+fi
+
+echo "Flashing Kernel to slot $NSLOT..."
+## Flash kernel
+# erase
+flash_erase /dev/mtd1 $NOFFSET 20
+# write
+nandwrite -p -s $NOFFSET /dev/mtd1 boot/uImage
+