diff --git a/Makefile b/Makefile
new file mode 100644
--- /dev/null
+++ b/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/abi_used_libs b/abi_used_libs
new file mode 100644
--- /dev/null
+++ b/abi_used_libs
@@ -0,0 +1,2 @@
+libc.so.6
+libpthread.so.0
diff --git a/package.yml b/package.yml
new file mode 100644
--- /dev/null
+++ b/package.yml
@@ -0,0 +1,22 @@
+name       : terraform
+version    : 0.11.7
+release    : 1
+source     :
+    - https://github.com/hashicorp/terraform/archive/v0.11.7.tar.gz : f9a2730dcd68dad754cf0efa017d51929a7f333a89d07ddff3c6ff7b2d1e8be3
+license    : MPL-2.0
+component  : programming.tools
+summary    : Terraform is a tool for building, changing, and combining infrastructure safely and efficiently.
+description: |
+    Terraform is a tool for building, changing, and versioning infrastructure safely and efficiently. 
+    Terraform can manage existing and popular service providers as well as custom in-house solutions.
+builddeps  :
+    - golang
+build      : |
+    mkdir -p src/github.com/hashicorp
+    export GOPATH=`pwd`
+    ln -sv `pwd` src/github.com/hashicorp/terraform
+    cd src/github.com/hashicorp/terraform
+    go build -o terraform-binary
+install    : |
+    cd src/github.com/hashicorp/terraform
+    install -Dm 00755 terraform-binary $installdir/usr/bin/terraform
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,36 @@
+<PISI>
+    <Source>
+        <Name>terraform</Name>
+        <Packager>
+            <Name>Philipp Trulson</Name>
+            <Email>philipp@trulson.de</Email>
+        </Packager>
+        <License>MPL-2.0</License>
+        <PartOf>programming.tools</PartOf>
+        <Summary xml:lang="en">Terraform is a tool for building, changing, and combining infrastructure safely and efficiently.</Summary>
+        <Description xml:lang="en">Terraform is a tool for building, changing, and versioning infrastructure safely and efficiently. 
+Terraform can manage existing and popular service providers as well as custom in-house solutions.
+</Description>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+    </Source>
+    <Package>
+        <Name>terraform</Name>
+        <Summary xml:lang="en">Terraform is a tool for building, changing, and combining infrastructure safely and efficiently.</Summary>
+        <Description xml:lang="en">Terraform is a tool for building, changing, and versioning infrastructure safely and efficiently. 
+Terraform can manage existing and popular service providers as well as custom in-house solutions.
+</Description>
+        <PartOf>programming.tools</PartOf>
+        <Files>
+            <Path fileType="executable">/usr/bin/terraform</Path>
+        </Files>
+    </Package>
+    <History>
+        <Update release="1">
+            <Date>2018-07-20</Date>
+            <Version>0.11.7</Version>
+            <Comment>Packaging update</Comment>
+            <Name>Philipp Trulson</Name>
+            <Email>philipp@trulson.de</Email>
+        </Update>
+    </History>
+</PISI>
\ No newline at end of file