diff --git a/CHANGES b/CHANGES
index a58c8a92..8911bc7b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -35,6 +35,7 @@ v2.0.0 (TBA)
 -Fixed (issue #584) - Fixed horrible spacing, aligned for 4 spaces.
 -Fixed (issue #196) - Fixed style crash due to malformed styles.
 -Fixed (issue #603) - Fixed unknown files prefixed with common name from being ignored.
+-Fixed (issue #606) - Fixed unknown files being ignored when -r is used.
 -Fixed issue with non-URI standard characters in apk name (Thanks rover12421)
 -Added output to list Apktool version to help debugging.
 -Updated known bytes for configurations to 38 (from addition of layout direction)
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
index 3169d5b1..f0a32f8b 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
@@ -276,9 +276,8 @@ public class ApkDecoder {
             putPackageInfo(meta);
             putVersionInfo(meta);
             putCompressionInfo(meta);
-            putUnknownInfo(meta);
-            //meta.put("packageId", getResTable().getPackageInfo().get("cur_package_id"));
         }
+        putUnknownInfo(meta);
 
         mAndrolib.writeMetaFile(mOutDir, meta);
     }