diff --git a/mj2/Makefile b/mj2/Makefile
index 9030770e..9ae30d6d 100644
--- a/mj2/Makefile
+++ b/mj2/Makefile
@@ -1,16 +1,14 @@
-#
+# 
 # Valentin Mesaros (Octalis | DICE/UCL Belgium)
 # 21 March 2005
-# Devaux François-Olivier (TELE/UCL Belgium)
-# 25 March 2005
-#
-# Makefile for mj2 source files (frames_to_mj2, mj2_to_frames, wrap_j2k_in_mj2
-#    and extract_j2k_from_mj2)
-#
+# 
+# Makefile for mj2 source files (frames_to_mj2, mj2_to_frames, extract_j2k_from_mj2, wrap_j2k_in_mj2)
+# 
 
-INCLUDES = -I. -I../libopenjpeg
+INCLUDES = -Imj2 \
+           -I../libopenjpeg
 
-C_OPT = -Wall -O3 -fno-strength-reduce -fomit-frame-pointer 
+C_OPT = -Wall -O -fno-strength-reduce -fomit-frame-pointer 
 CFLAGS = $(INCLUDES) $(C_OPT)
 
 CC = gcc
@@ -23,8 +21,8 @@ LIB_OPENJPEG = $(LIB_OPENJPEG_DIR)/libopenjpeg.a
 all: $(OBJ_MJ2_DIR) $(BIN_MJ2_DIR) \
      $(BIN_MJ2_DIR)/frames_to_mj2 \
      $(BIN_MJ2_DIR)/mj2_to_frames \
-     $(BIN_MJ2_DIR)/wrap_j2k_in_mj2 \
-     $(BIN_MJ2_DIR)/extract_j2k_from_mj2
+     $(BIN_MJ2_DIR)/extract_j2k_from_mj2 \
+     $(BIN_MJ2_DIR)/wrap_j2k_in_mj2
 
 
 $(OBJ_MJ2_DIR):
@@ -38,10 +36,11 @@ $(OBJ_MJ2_DIR)/%.o:
 
 $(OBJ_MJ2_DIR)/frames_to_mj2.o:		frames_to_mj2.c
 $(OBJ_MJ2_DIR)/mj2_to_frames.o:		mj2_to_frames.c
-$(OBJ_MJ2_DIR)/wrap_j2k_in_mj2.o:	wrap_j2k_in_mj2.c
-$(OBJ_MJ2_DIR)/extract_j2k_from_mj2.o:	extract_j2k_from_mj2.c
 $(OBJ_MJ2_DIR)/mj2.o:			mj2.c
 $(OBJ_MJ2_DIR)/mj2_convert.o:		mj2_convert.c
+$(OBJ_MJ2_DIR)/extract_j2k_from_mj2.o:	extract_j2k_from_mj2.c
+$(OBJ_MJ2_DIR)/wrap_j2k_in_mj2.o:	wrap_j2k_in_mj2.c
+
 
 
 MJ2_OBJS = $(addprefix $(OBJ_MJ2_DIR)/, mj2.o mj2_convert.o)
@@ -62,19 +61,19 @@ $(BIN_MJ2_DIR)/mj2_to_frames: $(OBJ_MJ2_DIR)/mj2_to_frames.o $(MJ2_OBJS) $(LIB_O
               $(LIB_OPENJPEG) \
               -lm
 
-$(BIN_MJ2_DIR)/wrap_j2k_in_mj2: $(OBJ_MJ2_DIR)/wrap_j2k_in_mj2.o $(MJ2_OBJS) $(LIB_OPENJPEG)
-	$(CC) $(CFLAGS) \
-              -o $(BIN_MJ2_DIR)/wrap_j2k_in_mj2 \
-              $(MJ2_OBJS) $(OBJ_MJ2_DIR)/wrap_j2k_in_mj2.o \
-              $(LIB_OPENJPEG) \
-              -lm
-              
+
 $(BIN_MJ2_DIR)/extract_j2k_from_mj2: $(OBJ_MJ2_DIR)/extract_j2k_from_mj2.o $(MJ2_OBJS) $(LIB_OPENJPEG)
 	$(CC) $(CFLAGS) \
               -o $(BIN_MJ2_DIR)/extract_j2k_from_mj2 \
               $(MJ2_OBJS) $(OBJ_MJ2_DIR)/extract_j2k_from_mj2.o \
               $(LIB_OPENJPEG) \
               -lm
+$(BIN_MJ2_DIR)/wrap_j2k_in_mj2: $(OBJ_MJ2_DIR)/wrap_j2k_in_mj2.o $(MJ2_OBJS) $(LIB_OPENJPEG)
+	$(CC) $(CFLAGS) \
+              -o $(BIN_MJ2_DIR)/wrap_j2k_in_mj2 \
+              $(MJ2_OBJS) $(OBJ_MJ2_DIR)/wrap_j2k_in_mj2.o \
+              $(LIB_OPENJPEG) \
+              -lm
 
 clean: 
-	rm -f $(BIN_MJ2_DIR)/* $(OBJ_MJ2_DIR)/*
+	rm -f $(BIN_MJ2_DIR)/* $(OBJ_MJ2_DIR)/*
\ No newline at end of file