diff --git a/CHANGES b/CHANGES
index b2603dab..20f0e1da 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,8 @@ v1.5.2 (TBA)
 -Fixed (issue #392) - Don't crash out if .git folder isn't present. Use SNAPSHOT-DEV instead.
 -Fixed (issue #67) - Only store compressed resources.arsc if original was compressed, otherwise STORE.
 -Moved build.gradle files to each sub-project, more organization :)
+-Fixed (issue #394) - Prevented duplicated files in final jar which saved around 1.2mb.
+-Added Proguard to drop final jar size from 6.2mb to 2.6mb.
 
 v1.5.1 PR3 (Released December 23 - 2012) Codename: Pre Release 3
 -Reverted "Prevents removal of <uses-sdk> on decompile, but then throws warning on rebuild (issue #366)"
diff --git a/brut.apktool/apktool-cli/build.gradle b/brut.apktool/apktool-cli/build.gradle
index 853174d3..963c71b8 100644
--- a/brut.apktool/apktool-cli/build.gradle
+++ b/brut.apktool/apktool-cli/build.gradle
@@ -15,6 +15,7 @@
  */
 
 version = apktoolversion
+apply plugin: 'fatjar'
 
 configurations {
     proguard
@@ -26,16 +27,14 @@ dependencies {
 }
 
 gradle.taskGraph.whenReady {
-  jar {
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-    
+  fatJar { 
     manifest {
       attributes("Main-Class": "brut.apktool.Main")
     }
   }
 }
 
-task proguard(type: JavaExec, dependsOn: jar) {
+task proguard(type: JavaExec, dependsOn: fatJar) {
     def outFile = jar.destinationDir.getPath() + '/' + jar.baseName + '-' + jar.version + '-small' + '.' + jar.extension
     inputs.file jar.archivePath
     outputs.file outFile
diff --git a/build.gradle b/build.gradle
index cd891960..e96ad36d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,6 +52,7 @@ buildscript {
   }
   dependencies {
     classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.5.0'
+    classpath 'eu.appsatori:gradle-fatjar-plugin:0.2-rc1'
   }
 }