diff --git a/deploy-assembly/pom.xml b/deploy-assembly/pom.xml
deleted file mode 100644
index 40693f237..000000000
--- a/deploy-assembly/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>jp.sf.amateras</groupId>
-    <artifactId>gitbucket-assembly</artifactId>
-    <version>0.0.1</version>
-    <build>
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ssh</artifactId>
-                <version>1.0-beta-6</version>
-            </extension>
-        </extensions>
-    </build>
-</project>
\ No newline at end of file
diff --git a/env.sh b/env.sh
new file mode 100644
index 000000000..ee2c1fadc
--- /dev/null
+++ b/env.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+export GITBUCKET_VERSION=3.3.0
diff --git a/project/build.scala b/project/build.scala
index 6279736cb..7047d253b 100644
--- a/project/build.scala
+++ b/project/build.scala
@@ -10,7 +10,7 @@ import sbtassembly.AssemblyKeys._
 object MyBuild extends Build {
   val Organization = "gitbucket"
   val Name = "gitbucket"
-  val Version = "3.3.0"
+  val Version = System.getenv("GITBUCKET_VERSION")
   val ScalaVersion = "2.11.6"
   val ScalatraVersion = "2.3.1"
 
diff --git a/build.xml b/release/build.xml
similarity index 92%
rename from build.xml
rename to release/build.xml
index 8c50690b5..2e6b8da97 100644
--- a/build.xml
+++ b/release/build.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<project name="gitbucket" default="all" basedir=".">
+<project name="gitbucket" default="all" basedir="..">
 
+  <property environment="env"/>
   <property name="target.dir" value="target"/>
   <property name="embed.classes.dir" value="${target.dir}/embed-classes"/>
   <property name="jetty.dir" value="embed-jetty"/>
   <property name="scala.version" value="2.11"/>
-  <property name="gitbucket.version" value="3.3.0"/>
+  <property name="gitbucket.version" value="${env.GITBUCKET_VERSION}"/>
   <property name="jetty.version" value="8.1.16.v20140903"/>
   <property name="servlet.version" value="3.0.0.v201112011016"/>
 
diff --git a/deploy-assembly/deploy-assembly-jar.sh b/release/deploy-assembly-jar.sh
similarity index 63%
rename from deploy-assembly/deploy-assembly-jar.sh
rename to release/deploy-assembly-jar.sh
index 272fcc640..4f372d437 100755
--- a/deploy-assembly/deploy-assembly-jar.sh
+++ b/release/deploy-assembly-jar.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
+source ../env.sh
+
 mvn deploy:deploy-file \
   -DgroupId=gitbucket\
   -DartifactId=gitbucket-assembly\
-  -Dversion=3.3.0\
+  -Dversion=$GITBUCKET_VERSION\
   -Dpackaging=jar\
-  -Dfile=../target/scala-2.11/gitbucket-assembly-3.3.0.jar\
+  -Dfile=../target/scala-2.11/gitbucket-assembly-$GITBUCKET_VERSION.jar\
   -DrepositoryId=sourceforge.jp\
   -Durl=scp://shell.sourceforge.jp/home/groups/a/am/amateras/htdocs/mvn/
diff --git a/release/make-release-war.sh b/release/make-release-war.sh
new file mode 100755
index 000000000..62457189f
--- /dev/null
+++ b/release/make-release-war.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+source ../env.sh
+ant -f build.xml all
diff --git a/sbt.sh b/sbt.sh
index eae1ce3a1..6119129d1 100755
--- a/sbt.sh
+++ b/sbt.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
+source ./env.sh
 java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.13.8.jar "$@"