diff --git a/apktool-lib/pom.xml b/apktool-lib/pom.xml
index 53cf5d65..cae3b7cd 100644
--- a/apktool-lib/pom.xml
+++ b/apktool-lib/pom.xml
@@ -16,7 +16,7 @@
     <name>apktool library</name>
 
     <properties>
-        <smaliVersion>1.2.4-brut3</smaliVersion>
+        <smaliVersion>1.2.6-brut5</smaliVersion>
         <root.basedir>${project.parent.basedir}</root.basedir>
     </properties>
 
@@ -69,7 +69,7 @@
         </dependency>
         <dependency>
             <groupId>brut.apktool.smali</groupId>
-            <artifactId>dexlib</artifactId>
+            <artifactId>util</artifactId>
             <version>${smaliVersion}</version>
         </dependency>
         <dependency>
diff --git a/apktool-lib/src/main/java/brut/androlib/mod/BaksmaliMod.java b/apktool-lib/src/main/java/brut/androlib/mod/BaksmaliMod.java
index befd288f..a0658ca3 100644
--- a/apktool-lib/src/main/java/brut/androlib/mod/BaksmaliMod.java
+++ b/apktool-lib/src/main/java/brut/androlib/mod/BaksmaliMod.java
@@ -23,7 +23,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.jf.baksmali.Adaptors.ClassDefinition;
 import org.jf.baksmali.baksmali;
-import org.jf.baksmali.fileNameHandler;
+import org.jf.util.ClassFileNameHandler;
 import org.jf.dexlib.ClassDefItem;
 import org.jf.dexlib.Code.Analysis.ClassPath;
 import org.jf.dexlib.DexFile;
@@ -114,7 +114,7 @@ public class BaksmaliMod {
             }
         });
 
-        fileNameHandler fileNameHandler = new fileNameHandler(outputDirectoryFile);
+        ClassFileNameHandler fileNameHandler = new ClassFileNameHandler(outputDirectoryFile, ".smali");
 
         for (ClassDefItem classDefItem: classDefItems) {
             /**
diff --git a/apktool-lib/src/main/java/brut/androlib/mod/IndentingWriter.java b/apktool-lib/src/main/java/brut/androlib/mod/IndentingWriter.java
index 013df6c1..99b1ce21 100644
--- a/apktool-lib/src/main/java/brut/androlib/mod/IndentingWriter.java
+++ b/apktool-lib/src/main/java/brut/androlib/mod/IndentingWriter.java
@@ -21,7 +21,7 @@ import java.io.Writer;
 /**
  * @author Ryszard Wiśniewski <brut.alll@gmail.com>
  */
-public class IndentingWriter extends org.jf.baksmali.IndentingWriter {
+public class IndentingWriter extends org.jf.util.IndentingWriter {
 
     public IndentingWriter(Writer writer) {
         super(writer);