diff --git a/Makefile b/Makefile
index 4f3b42afc..ee8a182ff 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,6 @@ cyclo:
 
 pre-build:
 	@echo "Running pre-build:"
-	@(env bash $(PWD)/buildscripts/git-commit-id.sh)
 
 build-all: verifiers
 	@echo "Building Libraries:"
diff --git a/buildscripts/git-commit-id.sh b/buildscripts/git-commit-id.sh
deleted file mode 100644
index ddf75f2fb..000000000
--- a/buildscripts/git-commit-id.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-CONST_FILE=build-constants.go
-
-cat > $CONST_FILE <<EOF
-/*
- * ** DO NOT EDIT THIS FILE. THIS FILE IS AUTO GENERATED BY RUNNING MAKE **
- */
-
-package main
-
-const (
-	minioGitCommitHash = "__GIT_COMMIT_HASH__"
-)
-EOF
-
-commit_id=$(git log --format="%H" -n 1)
-sed -i "s/__GIT_COMMIT_HASH__/$commit_id/" $CONST_FILE
diff --git a/hash-binary.go b/hash-binary.go
new file mode 100644
index 000000000..aaf3a24e1
--- /dev/null
+++ b/hash-binary.go
@@ -0,0 +1,28 @@
+package main
+
+import (
+	"fmt"
+	"io"
+	"os"
+
+	"crypto/md5"
+)
+
+// mustHashBinarySelf computes MD5SUM of a binary file on disk
+func hashBinary(progName string) (string, error) {
+	h := md5.New()
+
+	file, err := os.Open(progName) // For read access.
+	if err != nil {
+		return "", err
+	}
+
+	io.Copy(h, file)
+	return fmt.Sprintf("%x", h.Sum(nil)), nil
+}
+
+// mustHashBinarySelf computes MD5SUM of its binary file on disk
+func mustHashBinarySelf() string {
+	hash, _ := hashBinary(os.Args[0])
+	return hash
+}
diff --git a/main.go b/main.go
index 703bcfe80..bd259416b 100644
--- a/main.go
+++ b/main.go
@@ -240,15 +240,18 @@ func getSystemData() map[string]string {
 	}
 }
 
+// Version is based on MD5SUM of its binary
+var Version = mustHashBinarySelf()
+
 func main() {
 	// set up iodine
-	iodine.SetGlobalState("minio.git", minioGitCommitHash)
+	iodine.SetGlobalState("minio.version", Version)
 	iodine.SetGlobalState("minio.starttime", time.Now().Format(time.RFC3339))
 
 	// set up app
 	app := cli.NewApp()
 	app.Name = "minio"
-	app.Version = minioGitCommitHash
+	app.Version = Version
 	app.Author = "Minio.io"
 	app.Usage = "Minimalist Object Storage"
 	app.Flags = flags