diff --git a/ChangeLog b/ChangeLog
index 47ca7075..ea792bfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+September 8, 2009
+* [antonin] openjpeg.c : fixed initialization of parameters->cp_disto_alloc/fixed_quality/fixed_alloc/tcp_numlayers because they were preventing to use the -q and -f options.
+
 August 31, 2009
 * [antonin] JavaOpenJpegDecoder.c : fixed a signed/unsigned behaviour when returning form C to JAVA
 
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 88d44fd0..565c5caa 100644
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -239,8 +239,10 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete
 		parameters->decod_format = -1;
 		parameters->cod_format = -1;
 		parameters->tcp_rates[0] = 0;   
-        parameters->tcp_numlayers = 1;
-        parameters->cp_disto_alloc = 1;
+		parameters->tcp_numlayers = 0;
+    parameters->cp_disto_alloc = 0;
+		parameters->cp_fixed_alloc = 0;
+		parameters->cp_fixed_quality = 0;
 
 /* UniPG>> */
 #ifdef USE_JPWL