diff --git a/CHANGES b/CHANGES
index 10def483..cb264ce2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+October 10, 2011
+* [vincent] fix 'distcheck' rule
+
 October 07, 2011
 * [mickael] WIP: correct mistake in text output inside set_decoded_area function (credit to Winfried)
 + [mickael] WIP: update jp2 dump functions with the new V2 framework
diff --git a/Makefile.am b/Makefile.am
index 9984b53d..a742f5ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,13 @@ ltmain.sh \
 missing
 
 EXTRA_DIST = \
-CMake/CheckHaveGetopt.cmake \
+CMake/CTestCustom.cmake.in \
+CMake/FindFCGI.cmake \
+CMake/FindLCMS2.cmake \
+CMake/FindLCMS.cmake \
 CMake/OpenJPEGConfig.cmake.in \
 CMakeLists.txt \
+CTestConfig.cmake \
 AUTHORS \
 CHANGES \
 INSTALL \
@@ -35,7 +39,7 @@ THANKS \
 bootstrap.sh \
 libopenjpeg1.pc.cmake \
 libopenjpeg1.pc.in \
-opj_configh.cmake.in \
+opj_config.h.cmake.in \
 m4/opj_check_lib.m4 \
 m4/opj_doxygen.m4 \
 m4/pkg.m4
diff --git a/applications/jpip/tools/indexer/Makefile.am b/applications/jpip/tools/indexer/Makefile.am
index 786e779d..9e1b9cc6 100644
--- a/applications/jpip/tools/indexer/Makefile.am
+++ b/applications/jpip/tools/indexer/Makefile.am
@@ -25,7 +25,6 @@ event_mgr_handler.c \
 event_mgr_handler.h \
 idxjp2_manager.c \
 j2k_decoder.c \
-indexbox_manager.h \
 ext_libopenjpeg/phix_manager.c \
 ext_libopenjpeg/ppix_manager.c \
 ext_libopenjpeg/thix_manager.c \
diff --git a/applications/mj2/Makefile.am b/applications/mj2/Makefile.am
index f8d8eb37..cff65660 100644
--- a/applications/mj2/Makefile.am
+++ b/applications/mj2/Makefile.am
@@ -60,7 +60,7 @@ mj2_to_frames_CPPFLAGS = \
 @LCMS1_CFLAGS@ \
 -DOPJ_STATIC
 mj2_to_frames_CFLAGS = 
-mj2_to_frames_LDADD = @LCMS2_LIBS@ @LCMS1_LIBS@
+mj2_to_frames_LDADD = @LCMS2_LIBS@ @LCMS1_LIBS@ -lm
 mj2_to_frames_SOURCES = \
 $(OPJ_SRC) \
 ../common/color.c \
diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am
index 87ffda9b..aef6ba6f 100644
--- a/libopenjpeg/Makefile.am
+++ b/libopenjpeg/Makefile.am
@@ -14,11 +14,9 @@ lib_LTLIBRARIES = libopenjpeg.la
 libopenjpeg_la_CPPFLAGS = \
 -I. \
 -I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
-@LCMS1_CFLAGS@ \
-@LCMS2_CFLAGS@
+-I$(top_builddir)/libopenjpeg
 libopenjpeg_la_CFLAGS =
-libopenjpeg_la_LIBADD = @LCMS1_LIBS@ @LCMS2_LIBS@
+libopenjpeg_la_LIBADD = -lm
 libopenjpeg_la_LDFLAGS = -no-undefined -version-info @lt_version@
 
 libopenjpeg_la_SOURCES = \
@@ -53,6 +51,7 @@ dwt.h \
 event.h \
 fix.h \
 image.h \
+indexbox_manager.h \
 int.h \
 j2k.h \
 j2k_lib.h \