diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES
index 14ac96d7..d320ecfd 100644
--- a/applications/jpip/CHANGES
+++ b/applications/jpip/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPIP
 ! : changed
 + : added
 
+November 16, 2011
+* [kaori] fixed opj_server execusion error (instant terminating) with autotool, cmake still need to be fixed
+
 November 8, 2011
 ! [kaori] updated main page of doxygen
 ! [kaori] enabled OpenJPEG V2 API
diff --git a/applications/jpip/util/Makefile.am b/applications/jpip/util/Makefile.am
index 9e439d9b..6a6ab1bf 100644
--- a/applications/jpip/util/Makefile.am
+++ b/applications/jpip/util/Makefile.am
@@ -8,7 +8,7 @@ opj_server_CPPFLAGS = \
 -I$(top_srcdir)/applications/jpip/libopenjpip \
 -I$(top_builddir)/applications/jpip/libopenjpip
 #
-opj_server_CFLAGS = -DServer -DQUIT_SIGNAL=\"quitJPIP\"
+opj_server_CFLAGS = -DSERVER -DQUIT_SIGNAL=\"quitJPIP\"
 #
 opj_server_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_server.la @FCGI_LIBS@ -lm
 #