diff --git a/clamav-devel/ChangeLog b/clamav-devel/ChangeLog
index 477484cce..f40faf3c1 100644
--- a/clamav-devel/ChangeLog
+++ b/clamav-devel/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jun 23 22:52:43 CEST 2005 (tk)
+----------------------------------
+  * libclamav/mspack/qtmd.c: fix possible crash
+
 Thu Jun 23 15:49:10 CEST 2005 (tk)
 ----------------------------------
   * clamd: revert the queue limit patch
diff --git a/clamav-devel/libclamav/mspack/qtmd.c b/clamav-devel/libclamav/mspack/qtmd.c
index 4bccb7e07..23a598954 100644
--- a/clamav-devel/libclamav/mspack/qtmd.c
+++ b/clamav-devel/libclamav/mspack/qtmd.c
@@ -250,7 +250,9 @@ struct qtmd_stream *qtmd_init(struct mspack_system *system,
   if (!system) return NULL;
 
   /* Quantum supports window sizes of 2^10 (1Kb) through 2^21 (2Mb) */
-  if (window_bits < 10 || window_bits > 21) return NULL;
+
+  /* tk: temporary fix: only process 32KB+ window sizes */
+  if (window_bits < 15 || window_bits > 21) return NULL;
 
   input_buffer_size = (input_buffer_size + 1) & -2;
   if (input_buffer_size < 2) return NULL;