diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/SmaliPatchStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/SmaliPatchStep.kt
index 676687d..2ed6b08 100644
--- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/SmaliPatchStep.kt
+++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/SmaliPatchStep.kt
@@ -47,6 +47,8 @@ class SmaliPatchStep : Step(), IDexProvider, KoinComponent {
 
                 val lines = zip.openEntry(patchFile)!!.read()
                     .decodeToString()
+                    .replace("\r\n", "\n") // Replace CRLF endings with LF endings to be sure here
+                    .trimEnd { it == '\n' } // Remove trailing new lines to work with diff output properly
                     .split('\n')
 
                 try {