diff --git a/ChangeLog b/ChangeLog
index 87f25436e8..6113940d30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-05  David Schleef  <ds@schleef.org>
+
+	* gst/gsttrace.h:  Fix #ifdef nesting (bug #139109) Patch from
+	  jensgr@gmx.net (Jens Granseuer)
+
 2004-04-05  David Schleef  <ds@schleef.org>
 
 	* gst/gstbuffer.c: (_gst_buffer_sub_free),
diff --git a/gst/gsttrace.h b/gst/gsttrace.h
index 4e0e9ab856..d6c8ddadb1 100644
--- a/gst/gsttrace.h
+++ b/gst/gsttrace.h
@@ -24,12 +24,12 @@
 #ifndef __GST_TRACE_H__
 #define __GST_TRACE_H__
 
-#ifndef GST_DISABLE_TRACE
-
 #include <glib.h>
 
 G_BEGIN_DECLS
 
+#ifndef GST_DISABLE_TRACE
+
 typedef struct _GstTrace 	GstTrace;
 typedef struct _GstTraceEntry 	GstTraceEntry;
 
@@ -125,15 +125,11 @@ G_STMT_START {						\
 #endif
 
 
-#ifndef GST_DISABLE_TRACE
 extern gint _gst_trace_on;
 #define gst_trace_add_entry(trace,seq,data,msg) \
   if (_gst_trace_on) { \
     _gst_trace_add_entry(trace,(guint32)seq,(guint32)data,msg); \
   }
-#else
-#define gst_trace_add_entry(trace,seq,data,msg)
-#endif
 
 #else /* GST_DISABLE_TRACE */
 
@@ -164,6 +160,7 @@ extern gint _gst_trace_on;
 #define		gst_alloc_trace_print(trace)
 #define		gst_alloc_trace_set_flags(trace,flags)
 
+#define         gst_trace_add_entry(trace,seq,data,msg)
 
 #endif /* GST_DISABLE_TRACE */