diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..9423adc96
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+main.go ident
\ No newline at end of file
diff --git a/main.go b/main.go
index 13c74b8ea..4f7b935ac 100644
--- a/main.go
+++ b/main.go
@@ -24,6 +24,10 @@ import (
 	"github.com/minio-io/minio/pkg/utils/log"
 )
 
+// commitID is automatically set by git. Settings are controlled
+// through .gitattributes
+const commitID = "$Id$"
+
 var flags = []cli.Flag{
 	cli.StringFlag{
 		Name:  "domain,d",