diff --git a/CHANGES b/CHANGES
index e21fe133..2705d639 100644
--- a/CHANGES
+++ b/CHANGES
@@ -30,6 +30,7 @@ v2.0.0 (TBA)
 -Fixed (issue #571) - Fixed truncated strings (Thanks jtmuhone)
 -Fixed (issue #578) - Fixed apk's with multiple empty types via ignoring them
 -Fixed (issue #589) - Fixed apk's with one package named "android" from improper decoding.
+-Fixed (issue #601) - Make StringBlock thread safe (Thanks aluedeke)
 -Added output to list Apktool version to help debugging.
 -Updated known bytes for configurations to 38 (from addition of layout direction)
 -Fixed NPE when handling odex apks even with --no-src specified. (Thanks Rodrigo Chiossi)
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/StringBlock.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/StringBlock.java
index 32231979..10d365af 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/StringBlock.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/StringBlock.java
@@ -327,9 +327,9 @@ public class StringBlock {
 	private int[] m_styles;
 	private boolean m_isUTF8;
 	private int[] m_stringOwns;
-	private static final CharsetDecoder UTF16LE_DECODER = Charset.forName(
+	private final CharsetDecoder UTF16LE_DECODER = Charset.forName(
 			"UTF-16LE").newDecoder();
-	private static final CharsetDecoder UTF8_DECODER = Charset.forName("UTF-8")
+	private final CharsetDecoder UTF8_DECODER = Charset.forName("UTF-8")
 			.newDecoder();
 	private static final Logger LOGGER = Logger.getLogger(StringBlock.class
 			.getName());