diff --git a/Dockerfile b/Dockerfile
index 9dba73228..c573d9a4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,15 +5,15 @@ ENV ALLOW_CONTAINER_ROOT=1
 
 COPY . /go/src/app
 RUN \
-	apk add --no-cache git && \
+	apk add --no-cache git bash && \
 	go-wrapper download && \
-	go-wrapper install && \
+        go-wrapper install -ldflags "`./buildscripts/docker-flags.sh`" && \
 	mkdir -p /export/docker && \
 	cp /go/src/app/docs/Docker.md /export/docker/ && \
 	rm -rf /go/pkg /go/src && \
-	apk del git
+	apk del git bash
 
 EXPOSE 9000
-ENTRYPOINT ["go-wrapper", "run", "server"]
+ENTRYPOINT ["minio", "server"]
 VOLUME ["/export"]
 CMD ["/export"]
diff --git a/buildscripts/docker-flags.sh b/buildscripts/docker-flags.sh
new file mode 100755
index 000000000..0d77ab431
--- /dev/null
+++ b/buildscripts/docker-flags.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+#
+# Minio Cloud Storage, (C) 2016 Minio, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+minio="github.com/minio/minio"
+version="2016-09-11T17:42:18Z"
+release="RELEASE.2016-09-11T17-42-18Z"
+commit="85e2d886bcb005d49f3876d6849a2b5a55e03cd3"
+
+echo "-X ${minio}/cmd.Version=${version} -X ${minio}/cmd.ReleaseTag=${release} -X ${minio}/cmd.CommitID=${commit}"
+
diff --git a/main.go b/main.go
index 532cb448b..8eb16fc9b 100644
--- a/main.go
+++ b/main.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package main
+package main // import "github.com/minio/minio"
 
 import minio "github.com/minio/minio/cmd"