diff --git a/README.md b/README.md
index b8a055088..09ed999d7 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language
 
 ![Demo](http://gowalker.org/public/gogs_demo.gif)
 
-##### Current version: 0.3.5 Alpha
+##### Current version: 0.3.6 Alpha
 
 ### NOTICES
 
diff --git a/README_ZH.md b/README_ZH.md
index 50ba28c99..0b78a1bab 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -5,7 +5,7 @@ Gogs(Go Git Service) 是一个由 Go 语言编写的自助 Git 托管服务。
 
 ![Demo](http://gowalker.org/public/gogs_demo.gif)
 
-##### 当前版本：0.3.5 Alpha
+##### 当前版本：0.3.6 Alpha
 
 ## 开发目的
 
diff --git a/conf/VERSION b/conf/VERSION
new file mode 100644
index 000000000..c07dee828
--- /dev/null
+++ b/conf/VERSION
@@ -0,0 +1 @@
+0.3.6.0525 Alpha
\ No newline at end of file
diff --git a/gogs.go b/gogs.go
index 6bdc2e1e4..ed6769348 100644
--- a/gogs.go
+++ b/gogs.go
@@ -14,14 +14,26 @@ import (
 	"github.com/codegangsta/cli"
 
 	"github.com/gogits/gogs/cmd"
+	"github.com/gogits/gogs/modules/bin"
+	"github.com/gogits/gogs/modules/log"
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.3.5.0525 Alpha"
+const APP_VER = "0.3.6.0525 Alpha"
 
 func init() {
-	setting.AppVer = APP_VER
 	runtime.GOMAXPROCS(runtime.NumCPU())
+
+	// go-bindata -ignore=\\.DS_Store -debug -o modules/bin/conf.go -pkg="bin" conf/...
+	// Set and check if binary and static file version match.
+	setting.AppVer = APP_VER
+	data, err := bin.Asset("conf/VERSION")
+	if err != nil {
+		log.Fatal("Fail to read 'conf/VERSION': %v", err)
+	}
+	if string(data) != setting.AppVer {
+		log.Fatal("Binary and static file version does not match, did you forget to recompile?")
+	}
 }
 
 func main() {
diff --git a/modules/bin/conf.go b/modules/bin/conf.go
index 19a99f7f3..037e80a81 100644
--- a/modules/bin/conf.go
+++ b/modules/bin/conf.go
@@ -15,6 +15,7 @@ func bindata_read(path, name string) ([]byte, error) {
 	return buf, err
 }
 
+
 // conf_app_ini reads file data from disk. It returns an error on failure.
 func conf_app_ini() ([]byte, error) {
 	return bindata_read(
@@ -175,6 +176,14 @@ func conf_supervisor_ini() ([]byte, error) {
 	)
 }
 
+// conf_version reads file data from disk. It returns an error on failure.
+func conf_version() ([]byte, error) {
+	return bindata_read(
+		"/Users/jiahuachen/Applications/Go/src/github.com/gogits/gogs/conf/VERSION",
+		"conf/VERSION",
+	)
+}
+
 // Asset loads and returns the asset for the given name.
 // It returns an error if the asset could not be found or
 // could not be loaded.
@@ -196,25 +205,26 @@ func AssetNames() []string {
 }
 
 // _bindata is a table, holding each asset generator, mapped to its name.
-var _bindata = map[string]func() ([]byte, error){
-	"conf/app.ini":                        conf_app_ini,
-	"conf/content/git-bare.zip":           conf_content_git_bare_zip,
-	"conf/etc/supervisord.conf":           conf_etc_supervisord_conf,
-	"conf/gitignore/Android":              conf_gitignore_android,
-	"conf/gitignore/C":                    conf_gitignore_c,
-	"conf/gitignore/C Sharp":              conf_gitignore_c_sharp,
-	"conf/gitignore/C++":                  conf_gitignore_c_,
-	"conf/gitignore/Google Go":            conf_gitignore_google_go,
-	"conf/gitignore/Java":                 conf_gitignore_java,
-	"conf/gitignore/Objective-C":          conf_gitignore_objective_c,
-	"conf/gitignore/Python":               conf_gitignore_python,
-	"conf/gitignore/Ruby":                 conf_gitignore_ruby,
-	"conf/license/Affero GPL":             conf_license_affero_gpl,
-	"conf/license/Apache v2 License":      conf_license_apache_v2_license,
-	"conf/license/Artistic License 2.0":   conf_license_artistic_license_2_0,
+var _bindata = map[string] func() ([]byte, error) {
+	"conf/app.ini": conf_app_ini,
+	"conf/content/git-bare.zip": conf_content_git_bare_zip,
+	"conf/etc/supervisord.conf": conf_etc_supervisord_conf,
+	"conf/gitignore/Android": conf_gitignore_android,
+	"conf/gitignore/C": conf_gitignore_c,
+	"conf/gitignore/C Sharp": conf_gitignore_c_sharp,
+	"conf/gitignore/C++": conf_gitignore_c_,
+	"conf/gitignore/Google Go": conf_gitignore_google_go,
+	"conf/gitignore/Java": conf_gitignore_java,
+	"conf/gitignore/Objective-C": conf_gitignore_objective_c,
+	"conf/gitignore/Python": conf_gitignore_python,
+	"conf/gitignore/Ruby": conf_gitignore_ruby,
+	"conf/license/Affero GPL": conf_license_affero_gpl,
+	"conf/license/Apache v2 License": conf_license_apache_v2_license,
+	"conf/license/Artistic License 2.0": conf_license_artistic_license_2_0,
 	"conf/license/BSD (3-Clause) License": conf_license_bsd_3_clause_license,
-	"conf/license/GPL v2":                 conf_license_gpl_v2,
-	"conf/license/MIT License":            conf_license_mit_license,
-	"conf/mysql.sql":                      conf_mysql_sql,
-	"conf/supervisor.ini":                 conf_supervisor_ini,
+	"conf/license/GPL v2": conf_license_gpl_v2,
+	"conf/license/MIT License": conf_license_mit_license,
+	"conf/mysql.sql": conf_mysql_sql,
+	"conf/supervisor.ini": conf_supervisor_ini,
+	"conf/VERSION": conf_version,
 }