diff --git a/ChangeLog b/ChangeLog
index af6f19a7..40e6867a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ January 31, 2006
 - [Mathieu Malaterre] Remove all references to OPJ_EXPORT, no declspec in header file anymore
 + [Mathieu Malaterre] Add a def.in file which is a template for Module Definition
 + [Herve Drolon] added MSVC project and compiler directives to build a 'standard' WIN32 DLL
+! [Mathieu Malaterre] Update CMake to match the new shared lib system (no more def file)
 
 January 27, 2006
 * [Antonin Descampe] fixed a two initialization problems in t1.c and tcd.c
diff --git a/libopenjpeg/CMakeLists.txt b/libopenjpeg/CMakeLists.txt
index 46f9539c..9200772e 100644
--- a/libopenjpeg/CMakeLists.txt
+++ b/libopenjpeg/CMakeLists.txt
@@ -23,30 +23,10 @@ SET(OpenJPEG_SRCS
   tgt.c
 )
 
-# Prepare the .def file (Module definition)
-# depending on wether we are:
-# 1. Building a dll (shared lib)
-# 2. Wether we are using cl or bcc32 (underscore convention)
+# Pass proper definition to preprocessor to generate
+# shared lib
 IF(WIN32 AND BUILD_SHARED_LIBS)
-  SET(UNDERSCORE)
-  # Borland expect symbol to start with _
-  IF(BORLAND)
-    SET(UNDERSCORE "_")
-  ENDIF(BORLAND)
-  # Borland will by default use a .def file if present in
-  # the binary directory
-  CONFIGURE_FILE(
-    ${OPENJPEG_SOURCE_DIR}/libopenjpeg/openjpeg.def.in
-    ${OPENJPEG_BINARY_DIR}/libopenjpeg/openjpeg.def
-    @ONLY IMMEDIATE
-    )
-  # You can directly pass a .def file to cl this is
-  # recognized
-  IF(NOT BORLAND AND NOT MINGW)
-    SET(OpenJPEG_SRCS ${OpenJPEG_SRCS}
-      ${OPENJPEG_BINARY_DIR}/libopenjpeg/openjpeg.def
-      )
-  ENDIF(NOT BORLAND AND NOT MINGW)
+  ADD_DEFINITIONS(-DOPJ_EXPORTS)
 ENDIF(WIN32 AND BUILD_SHARED_LIBS)
 
 # Create the library
diff --git a/libopenjpeg/openjpeg.def.in b/libopenjpeg/openjpeg.def.in
deleted file mode 100644
index 8a86443b..00000000
--- a/libopenjpeg/openjpeg.def.in
+++ /dev/null
@@ -1,25 +0,0 @@
-; This file was generated by CMake (http://cmake.org)
-; Please see openjpeg/libopenjpeg/CMakeLists.txt and
-; openjpeg/libopenjpeg/openjpeg.def.in for more
-; information
-
-LIBRARY openjpeg.dll
-
-VERSION @OPENJPEG_MAJOR_VERSION@.@OPENJPEG_MINOR_VERSION@
-
-EXPORTS @UNDERSCORE@opj_image_create
-        @UNDERSCORE@opj_image_destroy
-        @UNDERSCORE@opj_cio_open
-        @UNDERSCORE@opj_cio_close
-        @UNDERSCORE@cio_tell
-        @UNDERSCORE@opj_set_event_mgr
-        @UNDERSCORE@opj_create_decompress
-        @UNDERSCORE@opj_destroy_decompress
-        @UNDERSCORE@opj_set_default_decoder_parameters
-        @UNDERSCORE@opj_setup_decoder
-        @UNDERSCORE@opj_decode
-        @UNDERSCORE@opj_create_compress
-        @UNDERSCORE@opj_destroy_compress
-        @UNDERSCORE@opj_set_default_encoder_parameters
-        @UNDERSCORE@opj_setup_encoder
-        @UNDERSCORE@opj_encode