diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53b21a14..0adeef7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,7 @@ ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
 INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 SUBDIRS(
   libopenjpeg
+  mj2
   )
 #-----------------------------------------------------------------------------
 # Build example only if requested
diff --git a/mj2/CMakeLists.txt b/mj2/CMakeLists.txt
new file mode 100644
index 00000000..d8030a71
--- /dev/null
+++ b/mj2/CMakeLists.txt
@@ -0,0 +1,40 @@
+# Makefile for the MJ2 codecs of the OpenJPEG library: frames_to_mj2, mj2_to_frames, extract_j2k_from_mj2 and wrap_j2k_in_mj2
+
+# Headers file are located here:
+INCLUDE_DIRECTORIES(
+  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
+  )
+
+ADD_EXECUTABLE(frames_to_mj2
+  frames_to_mj2.c
+  compat/getopt.c 
+  mj2_convert.c mj2.c )
+TARGET_LINK_LIBRARIES(frames_to_mj2 ${OPJ_PREFIX}openjpeg)
+IF(UNIX)
+  TARGET_LINK_LIBRARIES(frames_to_mj2 m)
+ENDIF(UNIX)
+
+ADD_EXECUTABLE(mj2_to_frames
+    mj2_to_frames.c
+    compat/getopt.c mj2_convert.c mj2.c )
+TARGET_LINK_LIBRARIES(mj2_to_frames ${OPJ_PREFIX}openjpeg)
+IF(UNIX)
+  TARGET_LINK_LIBRARIES(mj2_to_frames m)
+ENDIF(UNIX)
+
+ADD_EXECUTABLE(extract_j2k_from_mj2
+    extract_j2k_from_mj2.c
+    mj2.c )
+TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 ${OPJ_PREFIX}openjpeg)
+IF(UNIX)
+  TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 m)
+ENDIF(UNIX)
+
+ADD_EXECUTABLE(wrap_j2k_in_mj2
+    wrap_j2k_in_mj2.c
+    mj2.c )
+TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 ${OPJ_PREFIX}openjpeg)
+IF(UNIX)
+  TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 m)
+ENDIF(UNIX)
+