diff --git a/build.gradle b/build.gradle
index 13f16aa9..6eef3bd2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'license'
 ext.apktoolversion = '1.5.1-SNAPSHOT'
+import org.apache.tools.ant.filters.*
 
 repositories {
   mavenCentral()
@@ -83,22 +84,25 @@ subprojects {
 	}
     }
     project(':brut.apktool:apktool-lib') {
-        gradle.taskGraph.whenReady {
-              task copy <<  {
-                from 'src/main/resources'
-		into 'build/resources/main'
-		include '**/*.jar'
-          }
+
+	    processResources {
+               from('src/main/resources/properties') {
+		    include '**/*.properties'
+                    into 'properties'
+		    ext.fullrev = ''
+		    ant.loadfile(srcFile: "../../.git/refs/heads/master", property: ext.fullrev)
+		    filter(ReplaceTokens, tokens: [version: apktoolversion, gitrev: ant.properties[ext.fullrev].substring(0,10)])
+               }
+               from('src/main/resources/') {
+		    include '**/*.jar'
+               }
+
+         includeEmptyDirs = false
         }
-	processResources {
-		ext.fullrev = ''
-		ant.loadfile(srcFile: "../../.git/refs/heads/master", property: ext.fullrev)
-		filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [version: apktoolversion, gitrev: ant.properties[ext.fullrev].substring(0,10)])
-	}
 	dependencies {
 	    compile ("junit:junit:4.10") {
 			exclude(module: 'hamcrest-core')
-	    }
+            }
 	    compile project(':brut.j.dir'), project(':brut.j.util'), project(':brut.j.common'), project(':brut.apktool.smali:util'),
 			    project(':brut.apktool.smali:dexlib'), project(':brut.apktool.smali:baksmali'),project(':brut.apktool.smali:smali'),
 			    "org.yaml:snakeyaml:1.7", "xpp3:xpp3:1.1.4c","xmlunit:xmlunit:1.3", "com.google.guava:guava:12.0",