diff --git a/CHANGES b/CHANGES
index 66f86771..cf1d628e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -47,6 +47,7 @@ v2.0.0 (TBA)
 -Fixed (issue #682) - Fixed handling renamed manifests with ("yi")
 -Fixed (issue #664) - Fixed issue with apks with large StringPools failing to decode.
 -Fixed (issue #447) - Fixed bad cast of ResStringValue to ResAtr by handling ResStringValue correctly (Thanks whydoubt)
+-Fixed (issue #689) - Fixed issue with hard coding extension as PNG.
 -Fixed issue with APKs with multiple dex files.
 -Fixed issue with using Apktool without smali/baksmali for ApktoolProperties (Thanks teprrr)
 -Fixed issue with non-URI standard characters in apk name (Thanks rover12421)
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java
index 89f89fd2..d2c84c96 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResFileDecoder.java
@@ -61,11 +61,11 @@ public class ResFileDecoder {
                 return;
             }
             if (typeName.equals("drawable") || typeName.equals("mipmap")) {
-                if (inFileName.toLowerCase().endsWith(".9.png")) {
+                if (inFileName.toLowerCase().endsWith(".9." + ext)) {
                     outFileName = outResName + ".9" + ext;
 
                     // check for htc .r.9.png
-                    if (inFileName.toLowerCase().endsWith(".r.9.png")) {
+                    if (inFileName.toLowerCase().endsWith(".r.9" + ext)) {
                         outFileName = outResName + ".r.9" + ext;
                     }
 
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/drawable-xhdpi/9patch_samsung.9.qmg b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/drawable-xhdpi/9patch_samsung.9.qmg
new file mode 100644
index 00000000..286ab358
Binary files /dev/null and b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/drawable-xhdpi/9patch_samsung.9.qmg differ
diff --git a/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/drawable-xhdpi/ic_launcher_samsung.qmg b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/drawable-xhdpi/ic_launcher_samsung.qmg
new file mode 100644
index 00000000..71c6d760
Binary files /dev/null and b/brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/drawable-xhdpi/ic_launcher_samsung.qmg differ