diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c4afbfa..f1d8c28 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ pages:
     - master
   script:
     - chmod +x .gitlab-pages-generator.sh
-    - ./gitlab-pages-generator.sh . .public
+    - ./.gitlab-pages-generator.sh . .public
     - mv .public public
   artifacts:
     paths:
diff --git a/dev-go/context/context-0_pre20160817.ebuild b/dev-go/context/context-0_pre20160817.ebuild
new file mode 100644
index 0000000..3bf8b79
--- /dev/null
+++ b/dev-go/context/context-0_pre20160817.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/gorilla/context/..."
+EGIT_COMMIT="08b5f424b9271eedf6f9f0ce86cb9396ed337a42"
+ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A golang registry for global request variables"
+HOMEPAGE="https://github.com/gorilla/context"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
diff --git a/net-im/mattermost-bin/Manifest b/net-im/mattermost-bin/Manifest
new file mode 100644
index 0000000..9d06433
--- /dev/null
+++ b/net-im/mattermost-bin/Manifest
@@ -0,0 +1,2 @@
+DIST v3.5.1.tar.gz 27674353 SHA256 5f5ddccd5b1aaaec4b27d6128e11b94804bcc296472f2187a37fa26d584adba2 SHA512 0b7c56ff49228090c0855936a9b092cfd51f3c5f6356968ef5b91dc1362b00728f3daf2c8fdca394b4ab31aac51c74a6a95e2746a34ae22d313c43ca257826fd WHIRLPOOL 918fb2800f24f83455993d55dfc03b999b6dd34ff823561a42d5b4fce4a1724176b6220362f9556e7f0d2dcde78c4435f7d69f7593433ac8cb7c734cc4871d74
+EBUILD mattermost-3.5.1.ebuild 841 SHA256 cbb0cc2645eda29994d192a01c92fafdbe283c9f39507fd7e1db8bb5637aa7f4 SHA512 27e8b5da0751f7de9fc801c01819776690e256d43fac234ea73deaa5a490238481a84aff8c17110c9f570d2114aef82b4b1512e3b1b9fe5ca5eab88bc3d3ab77 WHIRLPOOL 5308f04e944049cbc4c1655410a6ea0faf5ca14940396297a6f467edbe45a5af469da553f5455a95177a893225f0507d90050953f6193488d1e7ce2e8dab3edb
diff --git a/net-im/mattermost-bin/mattermost-bin-3.5.1.ebuild b/net-im/mattermost-bin/mattermost-bin-3.5.1.ebuild
new file mode 100644
index 0000000..8b8bf32
--- /dev/null
+++ b/net-im/mattermost-bin/mattermost-bin-3.5.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit eutils user
+
+DESCRIPTION="Mattermost is an open source, self-hosted Slack-alternative"
+SRC_URI="https://github.com/${PN}/platform/archive/v${PV}.tar.gz"
+
+#MY_GIT_COMMIT="b598d29066ee0c36b7c1b604965d6c78edc39dfd"
+#S="${WORKDIR}/${PN}-v${PV}-${MY_GIT_COMMIT}"
+RESTRICT="mirror"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-lang/go-1.6
+	>=net-libs/nodejs-5"
+
+#PATCHES=( "${FILESDIR}/fix-Makefile-${PV}.patch" )
+
+#src_install() {
+#	local dest=/usr/bin
+#
+#	diropts -m755
+#	dodir ${dest}
+#
+#	exeinto ${dest}
+#	for f in "${PN}" gitlab-zip-cat gitlab-zip-metadata ; do
+#		doexe "${S}/${f}"
+#	done
+#
+#	## RC script ##
+#	newinitd "${FILESDIR}/${PN}-0.8.2.init" "${PN}"
+#	newconfd "${FILESDIR}/${PN}-0.8.2.conf" "${PN}"
+#}