diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES
index 4ab53e90..44efc730 100644
--- a/applications/jpip/CHANGES
+++ b/applications/jpip/CHANGES
@@ -8,6 +8,7 @@ What's New for OpenJPIP
 November 16, 2011
 * [kaori] fixed Region of Interest option, and memory leak of opj_dec_server
 + [kaori] new feature to target JP2 files from www (libcurl required)
+* [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
diff --git a/applications/jpip/util/Makefile.am b/applications/jpip/util/Makefile.am
index 7ed8b9fb..8be3a627 100644
--- a/applications/jpip/util/Makefile.am
+++ b/applications/jpip/util/Makefile.am
@@ -7,7 +7,7 @@ opj_server_CPPFLAGS = \
 -I. \
 -I$(top_srcdir)/applications/jpip/libopenjpip \
 -I$(top_builddir)/applications/jpip/libopenjpip \
--DServer \
+-DSERVER \
 -DQUIT_SIGNAL=\"quitJPIP\"
 #
 opj_server_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_server.la @FCGI_LIBS@ -lm