diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 18f0a47..c9716ab 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.dyndns.vahagn.sokoban"
       android:versionCode="0x00010000"
-      android:versionName="1.0">
+      android:versionName="@string/git_version">
     <uses-sdk android:minSdkVersion="10" 
 			  android:targetSdkVersion="14"/>
     <application android:label="@string/app_name" 
diff --git a/custom_rules.xml b/custom_rules.xml
new file mode 100644
index 0000000..145fbf1
--- /dev/null
+++ b/custom_rules.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="custom_rules">
+
+<target name="-pre-build">
+	<exec executable="cmd.exe" failonerror="true">
+		<arg line="/C version.bat"/>
+        <!--env key="NDK_MODULE_PATH" path="..:../native/ext"/-->
+	</exec>
+</target>
+
+</project>
diff --git a/version.bat b/version.bat
index 2de9e4a..eda88b4 100644
--- a/version.bat
+++ b/version.bat
@@ -1,3 +1,4 @@
+@echo off
 rem 
 rem	Copyright 2005-2013 Vahagn Khachatryan.
 rem
@@ -15,17 +16,16 @@ rem
 rem
 rem	Generate res\values\version.xml for windows.
 rem
-
-
 set VERSION_XML=res\values\version.xml
+echo on
 
-echo ^<?xml version="1.0" encoding="utf-8"?^> > %VERSION_XML%
-echo ^<resources^> >> %VERSION_XML%
-for /F "delims=" %%i in ('"git describe --tags --long --dirty=-x --abbrev=8"') do set VERSION=%%i
-echo ^<string name="gitversion"^>%VERSION%^</string^> >> %VERSION_XML%
-for /F "delims=" %%i in ('"git rev-parse HEAD"') do set GITHASH=%%i
-echo ^<string name="githash"^>%GITHASH%^</string^> >> %VERSION_XML%
-for /F "delims=" %%i in ('"%USERPROFILE%\bin\date.exe -R"') do set BUILDDATE=%%i
+@echo ^<?xml version="1.0" encoding="utf-8"?^> > %VERSION_XML%
+@echo ^<resources^> >> %VERSION_XML%
+@for /F "delims=" %%i in ('"git describe --tags --long --dirty=-x --abbrev=8"') do set VERSION=%%i
+echo ^<string name="git_version"^>%VERSION%^</string^> >> %VERSION_XML%
+@for /F "delims=" %%i in ('"git rev-parse HEAD"') do set GITHASH=%%i
+echo ^<string name="git_hash"^>%GITHASH%^</string^> >> %VERSION_XML%
+@for /F "delims=" %%i in ('"%USERPROFILE%\bin\date.exe -R"') do set BUILDDATE=%%i
 echo ^<string name="builddate"^>%BUILDDATE%^</string^> >> %VERSION_XML%
-echo ^</resources^> >> %VERSION_XML%
+@echo ^</resources^> >> %VERSION_XML%