diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
 name       : mongo-tools
-version    : 4.0.1
-release    : 8
+version    : 4.0.5
+release    : 9
 source     :
-    - https://github.com/mongodb/mongo-tools/archive/r4.0.1.tar.gz : f3836edb7907603a2d9e5020fe60acabb6a383ee579465eeef885460f6aab30f
+    - git|https://github.com/mongodb/mongo-tools.git : r4.0.5
 license    : Apache-2.0
 component  : programming.tools
 summary    : MongoDB tools provide import, export, and diagnostic capabilities
@@ -15,17 +15,24 @@
 rundeps    :
     - mongodb
 build      : |
-    . ./set_gopath.sh
-    mkdir bin
+    mkdir src bin
+    mv vendor/* src/
+    mkdir -p src/github.com/mongodb
+    ln -sv `pwd` src/github.com/mongodb/mongo-tools
+    export GOPATH=`pwd`
+    VersionStr="$(git describe)"
+    Gitspec="$(git rev-parse HEAD)"
+    importpath="github.com/mongodb/mongo-tools/common/options"
+
     for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
-        go build -o "bin/$i" -tags "ssl sasl" "$i/main/$i.go"
+        go build -o "bin/$i" -ldflags "-X ${importpath}.VersionStr=${VersionStr} -X ${importpath}.Gitspec=${Gitspec}" -tags "ssl sasl" "$i/main/$i.go"
     done
 install    : |
     for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
       install -Dm00755 bin/$i $installdir/usr/bin/$i
     done
 check      : |
-    export GOPATH=$PWD/.gopath:$PWD/vendor
-    for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump; do
+    export GOPATH=`pwd`
+    for i in bsondump mongostat mongofiles mongoexport mongoimport mongodump; do
         (cd $i && go test)
     done
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -31,12 +31,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="8">
-            <Date>2018-08-05</Date>
-            <Version>4.0.1</Version>
+        <Update release="9">
+            <Date>2018-12-24</Date>
+            <Version>4.0.5</Version>
             <Comment>Packaging update</Comment>
             <Name>Philipp Trulson</Name>
             <Email>philipp@trulson.de</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file