diff --git a/dev-go/gox/ChangeLog b/dev-go/gox/ChangeLog
new file mode 100644
index 0000000..7f38890
--- /dev/null
+++ b/dev-go/gox/ChangeLog
@@ -0,0 +1,5 @@
+*gox-0.3.1_alpha (24 Oct 2016)
+
+  24 Oct 2016; Manuel Friedli <manuel@fritteli.ch>
+  +files/0001-github-path.patch, +gox-0.3.1_alpha.ebuild, +metadata.xml:
+  dev-go/gox:  added tagged version of gox
diff --git a/dev-go/gox/Manifest b/dev-go/gox/Manifest
new file mode 100644
index 0000000..8cee3c2
--- /dev/null
+++ b/dev-go/gox/Manifest
@@ -0,0 +1,5 @@
+AUX 0001-github-path.patch 2669 SHA256 4564c5fd1f811c29c9ac54b839cd79abfcc4004ac929d4c954d1415e81f523b8 SHA512 4173bd176f37b5c34580a43378105667c11eb011884ac8acd77355532cb65a7932c6541cc61fe14f8b65126204ab03840023c2553b509b2b739b396574654970 WHIRLPOOL 9afcd6366c277d3073d6c0289d7659eb3a21463c05e0c722f516a3ee4b16250a2283562fbcfb9c5a082436febf3b524d1f21599c2008f4e3b1fe2666c833ba64
+DIST gox-0.3.1_alpha.tar.gz 15776 SHA256 e3088772684ec31b86a3cac8d5c08e0172f702dbae2233552e690128c3434990 SHA512 865921406c7f4d5724697dd9c6a64caeb48e09b274c3fedc43a3644311c8c40d602364b2097016d8334265eed064246e634943702a74dd8d223fe59c156b1ddd WHIRLPOOL 4690a13b6bd45b010cf02b5cddb03107514ba32e56955d14c4ebda882f5755927983cdc7eeb94da2ff0710c67f76cd9eeb97cbe132a3153da4ff8760eb9341f7
+EBUILD gox-0.3.1_alpha.ebuild 669 SHA256 678bd117f74e0c3e12b56ab974175cf8ae78c68ee23664e37abb885ebafd1f6e SHA512 b41a4aca9fae249e26dced4e17cd0b043e6a7582b7dfd4f94f291484fe131fe5b9dd10a54b81d1b365e7cbdb94bd16b729c4d88042889d58d4ef99a239624289 WHIRLPOOL 413d56d6e30513b14bb60d584731101b5d7f05a7a070fe4527f668dac57e6baa5b6eced0d4642f08bf1e4d42b90e5c85507a3bc930eba5e841d1e43ea40f029f
+MISC ChangeLog 199 SHA256 10972e08f881aa004ed3de3bbe91f20e8f6bfdec53a927e320ff762c80d5f729 SHA512 d0dd4510edcc809ce9f80afc8c64e7ffd5f3f4d48dc7b2172ad263f65478a351e53d78db476eda74023dd2cdeb8d89e47fb390b10bec393be576aa3e13246d44 WHIRLPOOL ba94db2c7c997ad4f996475683b76fd7d33dd1720cc2f0f629ea5d421455023f8a245b1a941f5ffffe2024f3d096aa835aae90f5f42c5b5fc9757c5d2dcde47e
+MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
diff --git a/dev-go/gox/files/0001-github-path.patch b/dev-go/gox/files/0001-github-path.patch
new file mode 100644
index 0000000..52656a3
--- /dev/null
+++ b/dev-go/gox/files/0001-github-path.patch
@@ -0,0 +1,74 @@
+diff --git a/src/github.com/fritteli/gox/README.md b/src/github.com/fritteli/gox/README.md
+index cb3f27d..8eb664b 100644
+--- a/src/github.com/fritteli/gox/README.md
++++ b/src/github.com/fritteli/gox/README.md
+@@ -10,7 +10,7 @@ To install Gox, please use `go get`. We tag versions so feel free to
+ checkout that tag and compile.
+ 
+ ```
+-$ go get github.com/mitchellh/gox
++$ go get github.com/fritteli/gox
+ ...
+ $ gox -h
+ ...
+@@ -27,22 +27,22 @@ by default and build for every platform by default:
+ $ gox
+ Number of parallel builds: 4
+ 
+--->      darwin/386: github.com/mitchellh/gox
+--->    darwin/amd64: github.com/mitchellh/gox
+--->       linux/386: github.com/mitchellh/gox
+--->     linux/amd64: github.com/mitchellh/gox
+--->       linux/arm: github.com/mitchellh/gox
+--->     freebsd/386: github.com/mitchellh/gox
+--->   freebsd/amd64: github.com/mitchellh/gox
+--->     openbsd/386: github.com/mitchellh/gox
+--->   openbsd/amd64: github.com/mitchellh/gox
+--->     windows/386: github.com/mitchellh/gox
+--->   windows/amd64: github.com/mitchellh/gox
+--->     freebsd/arm: github.com/mitchellh/gox
+--->      netbsd/386: github.com/mitchellh/gox
+--->    netbsd/amd64: github.com/mitchellh/gox
+--->      netbsd/arm: github.com/mitchellh/gox
+--->       plan9/386: github.com/mitchellh/gox
++-->      darwin/386: github.com/fritteli/gox
++-->    darwin/amd64: github.com/fritteli/gox
++-->       linux/386: github.com/fritteli/gox
++-->     linux/amd64: github.com/fritteli/gox
++-->       linux/arm: github.com/fritteli/gox
++-->     freebsd/386: github.com/fritteli/gox
++-->   freebsd/amd64: github.com/fritteli/gox
++-->     openbsd/386: github.com/fritteli/gox
++-->   openbsd/amd64: github.com/fritteli/gox
++-->     windows/386: github.com/fritteli/gox
++-->   windows/amd64: github.com/fritteli/gox
++-->     freebsd/arm: github.com/fritteli/gox
++-->      netbsd/386: github.com/fritteli/gox
++-->    netbsd/amd64: github.com/fritteli/gox
++-->      netbsd/arm: github.com/fritteli/gox
++-->       plan9/386: github.com/fritteli/gox
+ ```
+ 
+ Or, if you want to build a package and sub-packages:
+@@ -55,7 +55,7 @@ $ gox ./...
+ Or, if you want to build multiple distinct packages:
+ 
+ ```
+-$ gox github.com/mitchellh/gox github.com/hashicorp/serf
++$ gox github.com/fritteli/gox github.com/hashicorp/serf
+ ...
+ ```
+ 
+diff --git a/src/github.com/fritteli/gox/toolchain.go b/src/github.com/fritteli/gox/toolchain.go
+index b6926ab..e24d448 100644
+--- a/src/github.com/fritteli/gox/toolchain.go
++++ b/src/github.com/fritteli/gox/toolchain.go
+@@ -3,7 +3,7 @@ package main
+ import (
+ 	"bytes"
+ 	"fmt"
+-	"github.com/mitchellh/iochan"
++	"github.com/fritteli/iochan"
+ 	"io"
+ 	"os"
+ 	"os/exec"
diff --git a/dev-go/gox/gox-0.3.1_alpha.ebuild b/dev-go/gox/gox-0.3.1_alpha.ebuild
new file mode 100644
index 0000000..f6be074
--- /dev/null
+++ b/dev-go/gox/gox-0.3.1_alpha.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot eutils
+
+EGO_PN="github.com/fritteli/gox/..."
+MY_PV="v${PV/_/-}"
+ARCHIVE_URI="https://${EGO_PN%/*}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A dead simple, no frills Go cross compile tool"
+HOMEPAGE="https://github.com/fritteli/gox"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MPL-2.0"
+SLOT="0/${PVR}"
+IUSE=""
+
+DEPEND="dev-go/iochan"
+
+src_prepare() {
+	epatch "${FILESDIR}/0001-github-path.patch"
+
+	eapply_user
+}
+
+src_install() {
+	mkdir pkg || die
+	golang-build_src_install
+	dobin bin/*
+}
diff --git a/dev-go/gox/metadata.xml b/dev-go/gox/metadata.xml
new file mode 100644
index 0000000..67a771c
--- /dev/null
+++ b/dev-go/gox/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>manuel@fritteli.ch</email>
+		<name>Manuel Friedli</name>
+	</maintainer>
+</pkgmetadata>