diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES
index 38605cf2..cf68b81b 100644
--- a/applications/jpip/CHANGES
+++ b/applications/jpip/CHANGES
@@ -6,6 +6,7 @@ What's New for OpenJPIP
 + : added
 
 August 26, 2011
+* [antonin] fixed cmake and autotools files to reflect recent changes in JPIP
 ! [kaori] fixed Makefile.nix to load openjpeg library from this archive
 
 August 25, 2011
diff --git a/applications/jpip/libopenjpip/CMakeLists.txt b/applications/jpip/libopenjpip/CMakeLists.txt
index b61edf94..ff9d708a 100644
--- a/applications/jpip/libopenjpip/CMakeLists.txt
+++ b/applications/jpip/libopenjpip/CMakeLists.txt
@@ -21,6 +21,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/ihdrbox_manager.c
 ${CMAKE_CURRENT_SOURCE_DIR}/manfbox_manager.c
 ${CMAKE_CURRENT_SOURCE_DIR}/mhixbox_manager.c
 ${CMAKE_CURRENT_SOURCE_DIR}/target_manager.c
+${CMAKE_CURRENT_SOURCE_DIR}/cachemodel_manager.c
 )
 
 # Build the library
diff --git a/applications/jpip/libopenjpip/Makefile.am b/applications/jpip/libopenjpip/Makefile.am
index bcf7e10a..fbdffda4 100644
--- a/applications/jpip/libopenjpip/Makefile.am
+++ b/applications/jpip/libopenjpip/Makefile.am
@@ -21,6 +21,7 @@ ihdrbox_manager.c \
 manfbox_manager.c \
 mhixbox_manager.c \
 target_manager.c \
+cachemodel_manager.c \
 bool.h \
 boxheader_manager.h \
 box_manager.h \
@@ -36,7 +37,8 @@ metadata_manager.h \
 mhixbox_manager.h \
 msgqueue_manager.h \
 placeholder_manager.h \
-target_manager.h
+target_manager.h \
+cachemodel_manager.h
 
 libopenjpip_server_la_CPPFLAGS = \
 -I. \