diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java b/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java
index 69920fd7..07ae7855 100644
--- a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java
+++ b/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java
@@ -52,6 +52,7 @@ public final class DecoderStream extends FilterInputStream {
     /**
      * Creates a new decoder stream and chains it to the
      * input stream specified by the {@code pStream} argument.
+     * The stream will use a default decode buffer size.
      *
      * @param pStream the underlying input stream.
      * @param pDecoder the decoder that will be used to decode the underlying stream
@@ -59,9 +60,23 @@ public final class DecoderStream extends FilterInputStream {
      * @see java.io.FilterInputStream#in
      */
     public DecoderStream(final InputStream pStream, final Decoder pDecoder) {
+        this(pStream, pDecoder, 1024);
+    }
+
+    /**
+     * Creates a new decoder stream and chains it to the
+     * input stream specified by the {@code pStream} argument.
+     *
+     * @param pStream the underlying input stream.
+     * @param pDecoder the decoder that will be used to decode the underlying stream
+     * @param pBufferSize the size of the decode buffer
+     *
+     * @see java.io.FilterInputStream#in
+     */
+    public DecoderStream(final InputStream pStream, final Decoder pDecoder, final int pBufferSize) {
         super(pStream);
         mDecoder = pDecoder;
-        mBuffer = new byte[1024];
+        mBuffer = new byte[pBufferSize];
         mBufferPos = 0;
         mBufferLimit = 0;
     }
@@ -142,7 +157,7 @@ public final class DecoderStream extends FilterInputStream {
 
         // Skip until we have skipped pLength bytes, or have reached EOF
         long total = 0;
-        
+
         while (total < pLength) {
             int avail = mBufferLimit - mBufferPos;
 
diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java b/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java
index d6f7262b..58e07e2a 100644
--- a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java
+++ b/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java
@@ -75,7 +75,7 @@ public final class PackBitsDecoder implements Decoder {
     }
 
     /**
-     * Creates a {@code PackBitsDecoder}.
+     * Creates a {@code PackBitsDecoder}, with optional compatibility mode.
      * <p/>
      * As some implementations of PackBits-like encoders treat {@code -128} as length of
      * a compressed run, instead of a no-op, it's possible to disable no-ops