diff --git a/android/build.sh b/android/build.sh
index 99fc65b82..6b7f19aee 100644
--- a/android/build.sh
+++ b/android/build.sh
@@ -19,9 +19,7 @@ checkOK() {
 # Configs
 BUILDDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 APPDIR="$BUILDDIR/package"
-
-echo $BUILDDIR
-echo $APPDIR
+VERSION=`git describe --tags --abbrev=0 | cut -c 2-`
 
 # Move to the build directory
 cd $BUILDDIR
@@ -43,8 +41,9 @@ checkOK
 
 # Copy all app files
 echo "${OpenColor}${Green}* Copying all app files...${CloseColor}"
+sed "s/APP_VERSION/$VERSION/g" manifest.json > $APPDIR/manifest.json
 cd $BUILDDIR/..
-cp -af {css,font,img,js,lib,sound,config.js,version.js,index.html,./android/icon.png,./android/manifest.json} $APPDIR
+cp -af {css,font,img,js,lib,sound,config.js,version.js,index.html,./android/icon.png} $APPDIR
 checkOK
 
 # Building the APK
diff --git a/android/manifest.json b/android/manifest.json
index ad5062a03..88f9b2025 100644
--- a/android/manifest.json
+++ b/android/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Copay",
-  "version": "0.0.0.1",
+  "version": "APP_VERSION",
   "app": {
     "launch":{
       "local_path": "index.html"
diff --git a/manifest.json b/manifest.json
index 503df121e..d180e02f4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Copay",
   "description": "A multisignature bitcoin wallet",
-  "version": "0.0.5",
+  "version": "APP_VERSION",
   "homepage_url": "http://bitpay.github.io/copay",
   "browser_action": {
     "default_title": "Copay",
diff --git a/util/generate-app-extension.sh b/util/generate-app-extension.sh
index a5870b421..fff25d41f 100755
--- a/util/generate-app-extension.sh
+++ b/util/generate-app-extension.sh
@@ -12,6 +12,7 @@ fi
 
 # Configs
 APPDIR="./webapp"
+VERSION=`git describe --tags --abbrev=0 | cut -c 2-`
 CHROMEDIR="./chrome-extension"
 FIREFOXDIR="./firefox-addon"
 
@@ -71,7 +72,8 @@ checkOK
 
 # Copy all chrome-extension files
 echo -e "${OpenColor}${Green}* Copying all chrome-extension files...${CloseColor}"
-cp -af {css,font,img,js,lib,sound,config.js,version.js,index.html,popup.html,manifest.json} $CHROMEDIR
+sed "s/APP_VERSION/$VERSION/g" manifest.json > $CHROMEDIR/manifest.json
+cp -af {css,font,img,js,lib,sound,config.js,version.js,index.html,popup.html} $CHROMEDIR
 checkOK
 
 # Copy all firefox-addon files