diff --git a/.gitignore b/.gitignore
index fe07d255b..2bf24c098 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,5 @@
 /coverage.ec
 /libsrc/jsyntaxpane/jsyntaxpane/src/target/
 hs_err_pid*.log
-*.~*
\ No newline at end of file
+*.~*
+/revision.txt
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 861143fb2..a818f0443 100644
--- a/build.xml
+++ b/build.xml
@@ -50,6 +50,9 @@
     <property name="INSTALLERPROJECT" value="${basedir}/installer.iss"/>
     <property name="EXECONFIG" value="${basedir}/build_exe.xml"/>    
     <property name="EXE64CONFIG" value="${basedir}/build_exe64.xml"/>    
+    
+    <property name="REVFILE" value="${basedir}/revision.txt"/>
+    
     <property name="RUNPARAMS" value=""/>
 
     <import file="build_common.xml"/>
diff --git a/build_common.xml b/build_common.xml
index 9b3888465..c31187c80 100644
--- a/build_common.xml
+++ b/build_common.xml
@@ -277,7 +277,7 @@
     </target>
     
     <target name="-nightly-suffix" if="NIGHTLY">        
-        <property name="VERSIONSUFFIX" value="_${GITTAG}"/>         
+        <property name="VERSIONSUFFIX" value="_${GITSHORTTAG}"/>         
     </target>
     
     <target name="-nonightly-suffix" unless="NIGHTLY">
@@ -293,7 +293,20 @@
             <arg value="rev-parse"/>
             <arg value="HEAD"/>
         </exec>  
+        <echo message="${GITTAG}" file="${REVFILE}"/>
+        
+        
+        <loadfile srcfile="${REVFILE}" property="GITSHORTTAG">
+            <filterchain>
+               <headfilter lines="1" skip="0"/>
+               <tokenfilter>
+                  <replaceregex pattern="[0-9a-f]{33}$" replace="" flags="gi"/>
+               </tokenfilter>
+               <striplinebreaks/>
+            </filterchain>
+        </loadfile>
         <echo message="Git tag:${GITTAG}"/>
+        <echo message="Git shorttag:${GITSHORTTAG}"/>
         <echo message="Version: ${VERSION}"/>
     </target>
     
diff --git a/src/com/jpexs/decompiler/flash/ApplicationInfo.java b/src/com/jpexs/decompiler/flash/ApplicationInfo.java
index 9eaf153f5..a1f06fa39 100644
--- a/src/com/jpexs/decompiler/flash/ApplicationInfo.java
+++ b/src/com/jpexs/decompiler/flash/ApplicationInfo.java
@@ -49,7 +49,7 @@ public class ApplicationInfo {
             build = prop.getProperty("build");
             nightly = prop.getProperty("nightly").equals("true");
             if (nightly) {
-                version = version + " nightly build " + build;
+                version = version + " nightly build " + build.substring(0,7);
             }
         } catch (IOException | NullPointerException ex) {
             //ignore