diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java
index d79b6657..a5f0f7f1 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java
@@ -303,7 +303,6 @@ public class Androlib {
         buildNonDefaultSources(appDir);
         buildManifestFile(appDir, manifest, manifestOriginal);
         buildResources(appDir, meta.usesFramework);
-        buildLib(appDir);
         buildLibs(appDir);
         buildCopyOriginalFiles(appDir);
         buildApk(appDir, outFile);
@@ -545,12 +544,10 @@ public class Androlib {
         }
     }
 
-    public void buildLib(File appDir) throws AndrolibException {
-        buildLibrary(appDir, "lib");
-    }
-
     public void buildLibs(File appDir) throws AndrolibException {
+        buildLibrary(appDir, "lib");
         buildLibrary(appDir, "libs");
+        buildLibrary(appDir, "kotlin");
     }
 
     public void buildLibrary(File appDir, String folder) throws AndrolibException {
diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
index c8669211..70a50b51 100644
--- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
+++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
@@ -528,6 +528,11 @@ public class BuildAndDecodeTest {
         compareBinaryFolder("/smali", false);
     }
 
+    @Test
+    public void confirmKotlinFolderPersistsTest() throws BrutException, IOException {
+        checkFolderExists("/kotlin");
+    }
+
     @SuppressWarnings("unchecked")
     private void compareUnknownFiles() throws BrutException, IOException {
         MetaInfo control = new Androlib().readMetaFile(sTestOrigDir);
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/kotlin/kotlin.kotlin_builtins b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/kotlin/kotlin.kotlin_builtins
new file mode 100644
index 00000000..ee639e57
Binary files /dev/null and b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/kotlin/kotlin.kotlin_builtins differ