diff --git a/env.sh b/env.sh
deleted file mode 100644
index 137b31e..0000000
--- a/env.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-export GITBUCKET_VERSION=`cat project/build.scala | grep 'val Version' | cut -d \" -f 2`
-echo "GITBUCKET_VERSION: $GITBUCKET_VERSION"
diff --git a/release/deploy-assembly-jar.sh b/release/deploy-assembly-jar.sh
index bcb59c9..bbf753b 100755
--- a/release/deploy-assembly-jar.sh
+++ b/release/deploy-assembly-jar.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-. ../env.sh
+. ./env.sh
 
 cd ../
 ./sbt.sh clean assembly
diff --git a/release/env.sh b/release/env.sh
new file mode 100644
index 0000000..348db43
--- /dev/null
+++ b/release/env.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+export GITBUCKET_VERSION=`cat ../project/build.scala | grep 'val Version' | cut -d \" -f 2`
+echo "GITBUCKET_VERSION: $GITBUCKET_VERSION"
diff --git a/release/make-release-war.sh b/release/make-release-war.sh
index b9aacec..5a803e0 100755
--- a/release/make-release-war.sh
+++ b/release/make-release-war.sh
@@ -3,13 +3,13 @@
 D="$(cd "${D}"; pwd)"
 DD="$(dirname "${D}")"
 (
-  for f in "${DD}/env.sh" "${D}/build.xml"; do
+  for f in "${D}/env.sh" "${D}/build.xml"; do
     if [ ! -s "${f}" ]; then
       echo >&2 "$0: Unable to access file '${f}'"
       exit 1
     fi
   done
+  . "${D}/env.sh"
   cd "${DD}"
-  . "${DD}/env.sh"
   ant -f "${D}/build.xml" all
 )