diff --git a/.gitignore b/.gitignore
index 596209f5..23bc34cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,11 @@
-/nb*
-/target
-/apktool-lib/nb*
-/apktool-lib/target
-/apktool-cli/nb*
-/apktool-cli/target
+.gradle/
+brut.apktool.smali/baksmali/build*
+brut.apktool.smali/build*
+brut.apktool.smali/dexlib/build*
+brut.apktool.smali/smali/build*
+brut.apktool.smali/util/build*
+brut.apktool/apktool-cli/build*
+brut.apktool/apktool-lib/build*
+brut.apktool/build*
+build*
 *~
diff --git a/build.gradle b/build.gradle
index fdaa6d37..87c2666c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -61,35 +61,33 @@ subprojects {
 	}
     }
     project(':brut.apktool:apktool-lib') {
+      ext.baseVersion = '1.5.1'
+      ext.jarVersion = baseVersion
 
-    ext.baseVersion = '1.5.1'
-    ext.jarVersion = baseVersion
+	      def versionSuffix
+	      try {
+		  def git = org.eclipse.jgit.api.Git.open(file('.'))
+		  def head = git.getRepository().getRef("HEAD")
+		  versionSuffix = head.getObjectId().abbreviate(8).name()
 
-            def versionSuffix
-            try {
-                def git = org.eclipse.jgit.api.Git.open(file('.'))
-                def head = git.getRepository().getRef("HEAD")
-                versionSuffix = head.getObjectId().abbreviate(8).name()
+		  if (!git.status().call().clean) {
+		      versionSuffix += '-dirty'
+		  }
+	      } catch (Exception) {
+		  // In case we can't get the commit for some reason,
+		  // just use -dev
+		  versionSuffix = 'SNAPSHOT'
+	      }
 
-                if (!git.status().call().clean) {
-                    versionSuffix += '-dirty'
-                }
-            } catch (Exception) {
-                // In case we can't get the commit for some reason,
-                // just use -dev
-                versionSuffix = 'SNAPSHOT'
-            }
+	      version = baseVersion + '-' + versionSuffix
 
-            version = baseVersion + '-' + versionSuffix
-
-            // use <version>-dev for the jar name, rather than the
-            // full commit+dirty string
-            jarVersion = baseVersion + '-dev'
-
-        jar {
-            version = jarVersion
-        }
+	      // use <version>-dev for the jar name, rather than the
+	      // full commit+dirty string
+	      jarVersion = baseVersion + '-dev'
 
+	  jar {
+	      version = jarVersion
+	  }
 	dependencies {
 	    compile ("junit:junit:4.10") {
 			exclude(module: 'hamcrest-core')
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..45c897f9
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 08878cbc..1448e814 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Wed Sep 19 17:44:17 GMT-06:00 2012
+#Wed Sep 19 19:34:23 GMT-06:00 2012
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME