diff --git a/apktool-lib/pom.xml b/apktool-lib/pom.xml
index 0d2c3497..9159bb7c 100644
--- a/apktool-lib/pom.xml
+++ b/apktool-lib/pom.xml
@@ -49,6 +49,18 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>1.5</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -104,4 +116,12 @@
             <version>1.3</version>
         </dependency>
     </dependencies>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>sonatype-releases</id>
+            <name>Sonatype Releases</name>
+            <url>https://oss.sonatype.org/content/repositories/releases/</url>
+        </pluginRepository>
+    </pluginRepositories>
 </project>
diff --git a/apktool-lib/src/main/java/brut/androlib/Androlib.java b/apktool-lib/src/main/java/brut/androlib/Androlib.java
index b9ea2283..ee5608bb 100644
--- a/apktool-lib/src/main/java/brut/androlib/Androlib.java
+++ b/apktool-lib/src/main/java/brut/androlib/Androlib.java
@@ -375,7 +375,11 @@ public class Androlib {
     }
 
     public static String getVersion() {
-        return ApktoolProperties.get("aversion");
+        String version = ApktoolProperties.get("aversion");
+        return version.endsWith("-SNAPSHOT") ?
+                version.substring(0, version.length() - 9) + '.' +
+                    ApktoolProperties.get("git.commit.id.abbrev")
+                : version;
     }
 
     private File[] parseUsesFramework(Map<String, Object> usesFramework)
diff --git a/apktool-lib/src/main/resources/brut/androlib/apktool.properties b/apktool-lib/src/main/resources/brut/androlib/apktool.properties
index 4ca86ec8..06685676 100644
--- a/apktool-lib/src/main/resources/brut/androlib/apktool.properties
+++ b/apktool-lib/src/main/resources/brut/androlib/apktool.properties
@@ -1 +1,2 @@
 aversion = ${aversion}
+git.commit.id.abbrev = ${git.commit.id.abbrev}