diff --git a/build.xml b/build.xml
index abf200391..c1bac1aee 100644
--- a/build.xml
+++ b/build.xml
@@ -636,7 +636,7 @@
         <property name="version.suffix" value=""/>         
     </target>
     
-    <target name="-private-suffix" if="private">
+    <target name="-private-suffix" if="private">                
         <property name="version.suffix" value="_private_${git.short.tag}"/>         
     </target>
     
@@ -681,11 +681,11 @@
         <available file="git.exe" filepath="${env.PATH}" property="git.present" />
     </target>
     
-    <target name="-git-required" depends="-git-check-exists">             
+    <target name="-git-required" depends="-git-check-exists" unless="private">             
         <fail unless="git.present" message="Git not found. Please install git with commandline support."/>
     </target>
-    
-    <target name="git-tag" depends="-git-required">        
+            
+    <target name="-do-git-tag" if="git.present">
         <exec executable="git" outputproperty="git.tag" failonerror="true">
             <arg value="rev-parse"/>
             <arg value="HEAD"/>
@@ -699,6 +699,16 @@
         <echo level="info" message="Git shorttag:${git.short.tag}"/>
     </target>
     
+    <target name="-no-git-tag" if="private" unless="git.present">        
+        <property name="git.tag" value="unknown" />
+        <property name="git.short.tag" value="unk" />
+        <echo level="warning" message="Warning: Git executable not found. No revision hash will be included in release." />
+    </target>
+    
+    <target name="git-tag" depends="-git-required,-no-git-tag,-do-git-tag">        
+        
+    </target>
+    
     <target name="build" depends="-loadversion,build_lib,-timestamp,-suffix,compile">        
         <mkdir dir="${dist.dir}"/>
         <!-- <delete dir="${dist.lib.dir}"/> -->
@@ -804,7 +814,7 @@
     </target>
     
     
-    <target name="git-pull">
+    <target name="git-pull" depends="-git-required">
         <exec executable="git" failonerror="true">
             <arg value="pull"/>            
         </exec> 
diff --git a/libsrc/ffdec_lib/build.xml b/libsrc/ffdec_lib/build.xml
index 5490b9f96..2585f0928 100644
--- a/libsrc/ffdec_lib/build.xml
+++ b/libsrc/ffdec_lib/build.xml
@@ -135,17 +135,9 @@
         <available file="git" filepath="${env.PATH}" property="git.present" />
         <available file="git.exe" filepath="${env.Path}" property="git.present"/>
         <available file="git.exe" filepath="${env.PATH}" property="git.present" />
-    </target>
-    
-    <target name="-git-required" depends="-git-check-exists">             
-        <fail unless="git.present" message="Git not found. Please install git with commandline support."/>
-    </target>
-      
-    <target name="-timestamp" depends="-git-required">
-        <tstamp>
-            <format property="BUILTAT" pattern="MM/dd/yyyy hh:mm aa" timezone="CET"/>
-            <format property="VERDATE" pattern="yyyyddMM_hhmm" timezone="CET"/>
-        </tstamp>
+    </target>              
+                            
+    <target name="-do-git-tag" if="git.present">
         <exec executable="git" outputproperty="git.tag" failonerror="true">
             <arg value="rev-parse"/>
             <arg value="HEAD"/>
@@ -154,9 +146,30 @@
             <arg value="rev-parse"/>
             <arg value="--short"/>
             <arg value="HEAD"/>
-        </exec>                
+        </exec>        
         <echo level="info" message="Git tag:${git.tag}"/>
         <echo level="info" message="Git shorttag:${git.short.tag}"/>
+    </target>
+    
+    <target name="-no-git-tag" unless="git.present">        
+        <property name="git.tag" value="unknown" />
+        <property name="git.short.tag" value="unk" />
+        <echo level="warning" message="Warning: Git executable not found. No revision hash will be included in release." />
+    </target>
+    
+    <target name="-git-tag" depends="-git-check-exists,-no-git-tag,-do-git-tag">        
+        
+    </target>  
+    
+    
+    <target name="-dotimestamp">
+        <tstamp>
+            <format property="BUILTAT" pattern="MM/dd/yyyy hh:mm aa" timezone="CET"/>
+            <format property="VERDATE" pattern="yyyyddMM_hhmm" timezone="CET"/>
+        </tstamp>                         
+    </target>
+      
+    <target name="-timestamp" depends="-dotimestamp,-git-tag"> 
         <echo level="info" message="Library Version: ${version}"/>
     </target>