diff --git a/CHANGES b/CHANGES
index b613b075..b7519d34 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@ October 10, 2011
 * [vincent] fix 'distcheck' rule
 + [vincent] add libopenjpeg-jpwl.pc.in
 * [vincent] fix output when --disable-shared or --disable-static is passed to configure. Minor clean up of configure.ac.
+! [kaori]   change -v option was reactivated for JPIP
 
 October 07, 2011
 * [mickael] WIP: correct mistake in text output inside set_decoded_area function (credit to Winfried)
diff --git a/applications/codec/image_to_j2k.c b/applications/codec/image_to_j2k.c
index feb9ce89..759a8626 100644
--- a/applications/codec/image_to_j2k.c
+++ b/applications/codec/image_to_j2k.c
@@ -591,7 +591,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
 	};
 
 	/* parse the command line */
-	const char optlist[] = "i:o:r:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:"
+	const char optlist[] = "i:o:r:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:v:"
 #ifdef USE_JPWL
 		"W:"
 #endif /* USE_JPWL */
diff --git a/configure.ac b/configure.ac
index f703a554..ab80e523 100644
--- a/configure.ac
+++ b/configure.ac
@@ -415,7 +415,6 @@ applications/jpip/opj_server/Makefile
 applications/jpip/opj_client/Makefile
 applications/jpip/opj_client/opj_dec_server/Makefile
 applications/jpip/tools/Makefile
-applications/jpip/tools/indexer/Makefile
 doc/Makefile
 ])