diff --git a/configure.in b/configure.in
index 188ed8ce7..f1850a92a 100644
--- a/configure.in
+++ b/configure.in
@@ -614,6 +614,14 @@ AM_CONDITIONAL(USE_PLUTO_OR_CHARON, test x$pluto = xtrue -o x$charon = xtrue)
 AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$tools = xtrue)
 AM_CONDITIONAL(USE_FILE_CONFIG, test x$pluto = xtrue -o x$stroke = xtrue)
 
+dnl ==============================
+dnl  set global definitions
+dnl ==============================
+
+if test x$me = xtrue; then
+	AC_DEFINE(ME)
+fi
+
 dnl ==============================
 dnl  build Makefiles
 dnl ==============================
diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am
index 886422a61..b0404ea3b 100644
--- a/src/charon/Makefile.am
+++ b/src/charon/Makefile.am
@@ -107,7 +107,6 @@ else
 endif
 
 if USE_ME
-  AM_CFLAGS += -DME
   charon_SOURCES += encoding/payloads/endpoint_notify.c encoding/payloads/endpoint_notify.h \
     processing/jobs/initiate_mediation_job.c processing/jobs/initiate_mediation_job.h \
     processing/jobs/mediation_job.c processing/jobs/mediation_job.h \