diff --git a/Makefile b/Makefile
new file mode 100644
--- /dev/null
+++ b/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/files/0001-Disable-cross-compiling.patch b/files/0001-Disable-cross-compiling.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-Disable-cross-compiling.patch
@@ -0,0 +1,29 @@
+From 0f95eec98a65a44bd3894c31baa5f0b53e8b9ff8 Mon Sep 17 00:00:00 2001
+From: Philipp Trulson <philipp@trulson.de>
+Date: Fri, 30 Nov 2018 16:23:02 +0100
+Subject: [PATCH] Disable cross-compiling
+
+---
+ scripts/build.sh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/build.sh b/scripts/build.sh
+index a23d0a43a..2a622bb99 100755
+--- a/scripts/build.sh
++++ b/scripts/build.sh
+@@ -29,9 +29,9 @@ elif [ "${XC_OSARCH}x" != "x" ]; then
+ fi
+ 
+ # Determine the arch/os combos we're building for
+-XC_ARCH=${XC_ARCH:-"386 amd64"}
+-XC_OS=${XC_OS:-linux darwin windows freebsd openbsd netbsd solaris}
+-XC_OSARCH=${XC_OSARCH:-"linux/386 linux/amd64 linux/arm linux/arm64 darwin/386 darwin/amd64 windows/386 windows/amd64 freebsd/386 freebsd/amd64 freebsd/arm openbsd/386 openbsd/amd64 openbsd/arm netbsd/386 netbsd/amd64 solaris/amd64"}
++XC_ARCH="amd64"
++XC_OS="linux"
++XC_OSARCH="linux/amd64"
+ 
+ GOPATH=${GOPATH:-$(go env GOPATH)}
+ case $(uname) in
+-- 
+2.19.2
+
diff --git a/package.yml b/package.yml
new file mode 100644
--- /dev/null
+++ b/package.yml
@@ -0,0 +1,33 @@
+name       : vault
+version    : 1.0.0
+release    : 1
+source     :
+    - git|https://github.com/hashicorp/vault.git : v1.0.0
+homepage   : https://www.vaultproject.io/
+license    : MPL-2.0
+component  : security
+extract    : no
+networking : yes
+summary    : A tool for secrets management, encryption as a service, and privileged access management
+description: |
+    A tool for secrets management, encryption as a service, and privileged access management
+builddeps  :
+    - git
+    - golang
+    - yarn
+setup      : |
+    export GOPATH=`pwd`
+    mkdir -p bin src/github.com/hashicorp
+    cp -r $sources/vault.git $GOPATH/src/github.com/hashicorp/vault
+    cd $GOPATH/src/github.com/hashicorp/vault/
+    %patch -Np1 < $pkgfiles/0001-Disable-cross-compiling.patch
+    make bootstrap
+build      : |
+    export GOPATH=`pwd`
+    export PATH=$PATH:$GOPATH/bin
+    cd src/github.com/hashicorp/vault
+    mkdir -p pkg/web_ui
+    make static-dist
+    make bin
+install    : |
+    install -Dm00755 src/github.com/hashicorp/vault/bin/vault $installdir/usr/bin/vault
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
new file mode 100644
--- /dev/null
+++ b/pspec_x86_64.xml
@@ -0,0 +1,35 @@
+<PISI>
+    <Source>
+        <Name>vault</Name>
+        <Homepage>https://www.vaultproject.io/</Homepage>
+        <Packager>
+            <Name>Philipp Trulson</Name>
+            <Email>philipp@trulson.de</Email>
+        </Packager>
+        <License>MPL-2.0</License>
+        <PartOf>security</PartOf>
+        <Summary xml:lang="en">A tool for secrets management, encryption as a service, and privileged access management</Summary>
+        <Description xml:lang="en">A tool for secrets management, encryption as a service, and privileged access management
+</Description>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+    </Source>
+    <Package>
+        <Name>vault</Name>
+        <Summary xml:lang="en">A tool for secrets management, encryption as a service, and privileged access management</Summary>
+        <Description xml:lang="en">A tool for secrets management, encryption as a service, and privileged access management
+</Description>
+        <PartOf>security</PartOf>
+        <Files>
+            <Path fileType="executable">/usr/bin/vault</Path>
+        </Files>
+    </Package>
+    <History>
+        <Update release="1">
+            <Date>2018-12-07</Date>
+            <Version>1.0.0</Version>
+            <Comment>Packaging update</Comment>
+            <Name>Philipp Trulson</Name>
+            <Email>philipp@trulson.de</Email>
+        </Update>
+    </History>
+</PISI>
\ No newline at end of file