diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b93c9af15..9b674c0b0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.linphone"
-      android:versionCode="2003" android:versionName="2.0.3" android:installLocation="auto"> 
+      android:versionCode="2003" android:installLocation="auto"> 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="17"/>
     
     <!-- Permissions for Push Notification -->
diff --git a/Makefile b/Makefile
index efd35a7ea..48c0055f4 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo || echo "4" )
 TOPDIR=$(shell pwd)
 PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon)
 LINPHONE_VERSION=$(shell cd submodules/linphone && git describe)
+LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe)
 ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1)
 
 BUILD_X264=0
@@ -90,10 +91,10 @@ generate-libs:
 
 update-project:
 	$(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET)
-	touch default.properties
 
 generate-apk:
 	ant partial-clean
+	echo "version.name=$(LINPHONE_ANDROID_DEBUG_VERSION)" > default.properties
 	ant debug
 
 install-apk:
@@ -101,6 +102,9 @@ install-apk:
 
 release: update-project
 	ant clean
+	echo "What is the version name for the release ?"; \
+    read version; \
+	echo "version.name=$$version" > default.properties
 	ant release
 
 run-linphone:
diff --git a/custom_rules.xml b/custom_rules.xml
index a9b967225..89a640980 100644
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -62,7 +62,7 @@
     	</javadoc>
 	</target>
 
-	<target name="-package-resources" depends="-crunch">
+	<target name="-package-resources" depends="-crunch">	    
 		<!-- only package resources if *not* a library project -->
 		<do-only-if-not-library elseText="Library project: do not package resources...">
 			<exec executable="${aapt}" failonerror="true">
@@ -71,6 +71,8 @@
 				<arg value="-v" />
 				<arg value="--version-code" />
 				<arg value="${version.code}" />
+				<arg value="--version-name" />
+				<arg value="${version.name}" />
 				<arg value="--debug-mode" />
 				<arg value="-m" />
 				<arg value="-u" />
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 05d0150af..5301b0982 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -418,7 +418,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 		} catch (NameNotFoundException nnfe) {}
 
 		if (info != null) {
-			Log.i("Linphone version is ", info.versionCode);
+			Log.i("Linphone version is ", info.versionName + " (" + info.versionCode + ")");
 		} else {
 			Log.i("Linphone version is unknown");
 		}