diff --git a/build.gradle b/build.gradle
index 22c12694f0..d552973206 100644
--- a/build.gradle
+++ b/build.gradle
@@ -171,8 +171,7 @@ def parseConfig(File config) {
 }
 
 jar {
-    //rename the default output, for some better... sanity with scipts
-    archiveName = "${baseName}-${version}.${extension}"
+    classifier "pure" // Jar without jar-in-jar
 
      manifest {
         attributes([
@@ -204,6 +203,16 @@ task deobfJar(type: Jar) {
     from sourceSets.main.output
 }
 
+tasks.jarJar.configure {
+    classifier "" // "Main" jar should be the one with jar-in-jar
+
+    exclude "**/*.bat"
+    exclude "**/*.psd"
+    exclude "**/*.exe"
+    exclude "**/unused"
+    exclude "**/genscripts"
+}
+
 artifacts {
     archives sourcesJar
     archives deobfJar