diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000000..53978e5317
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+0.5.1-dev
diff --git a/commands.go b/commands.go
index 899a8e2f1a..e538fc7765 100644
--- a/commands.go
+++ b/commands.go
@@ -27,10 +27,9 @@ import (
 	"unicode"
 )
 
-const VERSION = "0.5.3-dev"
-
 var (
 	GITCOMMIT string
+	VERSION string
 )
 
 func (cli *DockerCli) getMethod(name string) (reflect.Method, bool) {
diff --git a/docker/docker.go b/docker/docker.go
index a48865bfa3..bd1b4e9333 100644
--- a/docker/docker.go
+++ b/docker/docker.go
@@ -16,6 +16,7 @@ import (
 
 var (
 	GITCOMMIT string
+	VERSION string
 )
 
 func main() {
@@ -52,6 +53,7 @@ func main() {
 		os.Setenv("DEBUG", "1")
 	}
 	docker.GITCOMMIT = GITCOMMIT
+	docker.VERSION = VERSION
 	if *flDaemon {
 		if flag.NArg() != 0 {
 			flag.Usage()