diff --git a/bin/build-all.sh b/bin/build-all.sh
index 6a1cf9830..8137745e9 100755
--- a/bin/build-all.sh
+++ b/bin/build-all.sh
@@ -2,7 +2,8 @@
 
 set -e
 
-VERSION=`bin/buildinfo.py`
+VERSION=`bin/buildinfo.py long`
+SHORT_VERSION=`bin/buildinfo.py short`
 
 BOARDS_ESP32="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec tbeam0.7"
 #BOARDS_ESP32=tbeam
@@ -91,6 +92,7 @@ Generated by bin/buildall.sh -->
 
 <resources>
     <string name="cur_firmware_version" translatable="false">$VERSION</string>
+    <string name="short_firmware_version" translatable="false">$SHORT_VERSION</string>
 </resources>
 XML
 
diff --git a/bin/buildinfo.py b/bin/buildinfo.py
index 1dc5d98ef..6b123c9cf 100755
--- a/bin/buildinfo.py
+++ b/bin/buildinfo.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python3
 import configparser
+import sys
 from readprops import readProps
 
 
 verObj = readProps('version.properties')
-print(f"{verObj['long']}")
+propName = sys.argv[1]
+print(f"{verObj[propName]}")