diff --git a/ChangeLog b/ChangeLog
index 620f3e99..35aa1f43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+June 22, 2010
++ [MM] Apply patch from w. szukalski (sent to list)
+
 June 21, 2010
 + [MM] Added a j2k_dump to simply dump the parameter of a J2K file
 
diff --git a/codec/Makefile b/codec/Makefile
index 58996fb4..b3c93b0e 100644
--- a/codec/Makefile
+++ b/codec/Makefile
@@ -1,8 +1,8 @@
 # Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k
 
-CFLAGS = -O3 -lstdc++ # -g -p -pg
+CFLAGS = -Wall -O3 -lstdc++ # -g -p -pg
 
-all: j2k_to_image image_to_j2k
+all: j2k_to_image image_to_j2k j2k_dump
 
 j2k_to_image: j2k_to_image.c ../libopenjpeg.a
 	gcc $(CFLAGS) compat/getopt.c index.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff -lpng
@@ -10,5 +10,8 @@ j2k_to_image: j2k_to_image.c ../libopenjpeg.a
 image_to_j2k: image_to_j2k.c ../libopenjpeg.a
 	gcc $(CFLAGS) compat/getopt.c index.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff -lpng
 
+j2k_dump: j2k_dump.c ../libopenjpeg.a
+	gcc $(CFLAGS) compat/getopt.c index.c j2k_dump.c -o j2k_dump -L.. -lopenjpeg -I ../libopenjpeg/ -lm
+
 clean:
-	rm -f j2k_to_image image_to_j2k
+	rm -f j2k_to_image image_to_j2k j2k_dump
diff --git a/codec/j2k_dump.c b/codec/j2k_dump.c
index 6d92bcbb..a63c9946 100644
--- a/codec/j2k_dump.c
+++ b/codec/j2k_dump.c
@@ -317,7 +317,7 @@ int main(int argc, char *argv[])
 	int file_length;
 	int num_images;
 	int i,imageno;
-	dircnt_t *dirptr;
+	dircnt_t *dirptr = NULL;
 	opj_dinfo_t* dinfo = NULL;	/* handle to a decompressor */
 	opj_cio_t *cio = NULL;
 	opj_codestream_info_t cstr_info;  /* Codestream information structure */
diff --git a/libopenjpeg/j2k.h b/libopenjpeg/j2k.h
index 8fc8e6dc..74eba223 100644
--- a/libopenjpeg/j2k.h
+++ b/libopenjpeg/j2k.h
@@ -438,6 +438,7 @@ Encode an image into a JPEG-2000 codestream
 */
 bool j2k_encode(opj_j2k_t *j2k, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info);
 
+void j2k_dump_cp(FILE *fd, opj_image_t * img, opj_cp_t * cp);
 /* ----------------------------------------------------------------------- */
 /*@}*/