diff --git a/CHANGELOG b/CHANGELOG
index ab7e4541..b5a1280d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,10 @@ HISTORY
 
  ++ Bugfixes:
 
+  2011-09-01: Simon Goldschmidt
+  * opt.h: fixed bug #31809 LWIP_EVENT_API in opts.h is inconsistent compared
+    to other options
+
   2011-09-01: Simon Goldschmidt
   * tcp_in.c: fixed bug #34111 RST for ACK to listening pcb has wrong seqno
 
diff --git a/src/include/lwip/opt.h b/src/include/lwip/opt.h
index 6f2ca177..941e948f 100644
--- a/src/include/lwip/opt.h
+++ b/src/include/lwip/opt.h
@@ -1034,14 +1034,11 @@
  *     LWIP_EVENT_API==1: The user defines lwip_tcp_event() to receive all
  *         events (accept, sent, etc) that happen in the system.
  *     LWIP_CALLBACK_API==1: The PCB callback function is called directly
- *         for the event.
+ *         for the event. This is the default.
  */
-#ifndef LWIP_EVENT_API
+#if !defined(LWIP_EVENT_API) && !defined(LWIP_CALLBACK_API)
 #define LWIP_EVENT_API                  0
 #define LWIP_CALLBACK_API               1
-#else 
-#define LWIP_EVENT_API                  1
-#define LWIP_CALLBACK_API               0
 #endif