diff --git a/ChangeLog b/ChangeLog
index 28aa49bcc6..90fd303817 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2006-06-23  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst-libs/gst/rtp/gstbasertpaudiopayload.c:
+	* gst-libs/gst/rtp/gstbasertpdepayload.c:
+	* gst-libs/gst/rtp/gstbasertppayload.c:
+	* gst/ffmpegcolorspace/gstffmpegcolorspace.c:
+	* gst/tcp/gstmultifdsink.c:
+	* gst/tcp/gsttcpclientsink.c:
+	* gst/tcp/gsttcpclientsrc.c:
+	* gst/tcp/gsttcpserversink.c:
+	* gst/tcp/gsttcpserversrc.c:
+	* gst/videorate/gstvideorate.c:
+	* gst/videotestsrc/gstvideotestsrc.c:
+	* sys/v4l/gstv4ljpegsrc.c:
+	* sys/v4l/gstv4lmjpegsink.c:
+	* sys/v4l/gstv4lsrc.c:
+	* tests/examples/seek/scrubby.c:
+	* tests/examples/seek/seek.c:
+	  Use GST_DEBUG_CATEGORY_STATIC where possible (#342503).
+
 2006-06-22  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst-libs/gst/tag/tags.c: (register_tag_image_type_enum):
diff --git a/gst-libs/gst/rtp/gstbasertpaudiopayload.c b/gst-libs/gst/rtp/gstbasertpaudiopayload.c
index 281ca27f57..9410e0de06 100644
--- a/gst-libs/gst/rtp/gstbasertpaudiopayload.c
+++ b/gst-libs/gst/rtp/gstbasertpaudiopayload.c
@@ -27,7 +27,7 @@
 
 #include "gstbasertpaudiopayload.h"
 
-GST_DEBUG_CATEGORY (basertpaudiopayload_debug);
+GST_DEBUG_CATEGORY_STATIC (basertpaudiopayload_debug);
 #define GST_CAT_DEFAULT (basertpaudiopayload_debug)
 
 static void gst_basertpaudiopayload_finalize (GObject * object);
diff --git a/gst-libs/gst/rtp/gstbasertpdepayload.c b/gst-libs/gst/rtp/gstbasertpdepayload.c
index ba9d8dc50f..e290f00f71 100644
--- a/gst-libs/gst/rtp/gstbasertpdepayload.c
+++ b/gst-libs/gst/rtp/gstbasertpdepayload.c
@@ -20,7 +20,7 @@
 
 #include "gstbasertpdepayload.h"
 
-GST_DEBUG_CATEGORY (basertpdepayload_debug);
+GST_DEBUG_CATEGORY_STATIC (basertpdepayload_debug);
 #define GST_CAT_DEFAULT (basertpdepayload_debug)
 
 /* Filter signals and args */
diff --git a/gst-libs/gst/rtp/gstbasertppayload.c b/gst-libs/gst/rtp/gstbasertppayload.c
index 80c3683c4e..36d262d845 100644
--- a/gst-libs/gst/rtp/gstbasertppayload.c
+++ b/gst-libs/gst/rtp/gstbasertppayload.c
@@ -22,7 +22,7 @@
 
 #include "gstbasertppayload.h"
 
-GST_DEBUG_CATEGORY (basertppayload_debug);
+GST_DEBUG_CATEGORY_STATIC (basertppayload_debug);
 #define GST_CAT_DEFAULT (basertppayload_debug)
 
 /* BaseRTPPayload signals and args */
diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
index bfe0b7e069..197071aa71 100644
--- a/gst/ffmpegcolorspace/gstffmpegcolorspace.c
+++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
@@ -39,7 +39,7 @@
 #include "gstffmpegcolorspace.h"
 #include "gstffmpegcodecmap.h"
 
-GST_DEBUG_CATEGORY (ffmpegcolorspace_debug);
+GST_DEBUG_CATEGORY_STATIC (ffmpegcolorspace_debug);
 #define GST_CAT_DEFAULT ffmpegcolorspace_debug
 
 /* elementfactory information */
diff --git a/gst/tcp/gstmultifdsink.c b/gst/tcp/gstmultifdsink.c
index adc29fe199..950d44b258 100644
--- a/gst/tcp/gstmultifdsink.c
+++ b/gst/tcp/gstmultifdsink.c
@@ -155,7 +155,7 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS_ANY);
 
-GST_DEBUG_CATEGORY (multifdsink_debug);
+GST_DEBUG_CATEGORY_STATIC (multifdsink_debug);
 #define GST_CAT_DEFAULT (multifdsink_debug)
 
 /* MultiFdSink signals and args */
diff --git a/gst/tcp/gsttcpclientsink.c b/gst/tcp/gsttcpclientsink.c
index 751bc4ed7d..9da1454c12 100644
--- a/gst/tcp/gsttcpclientsink.c
+++ b/gst/tcp/gsttcpclientsink.c
@@ -42,7 +42,7 @@ enum
   LAST_SIGNAL
 };
 
-GST_DEBUG_CATEGORY (tcpclientsink_debug);
+GST_DEBUG_CATEGORY_STATIC (tcpclientsink_debug);
 #define GST_CAT_DEFAULT (tcpclientsink_debug)
 
 enum
diff --git a/gst/tcp/gsttcpclientsrc.c b/gst/tcp/gsttcpclientsrc.c
index 96f9de876e..b277feb3a6 100644
--- a/gst/tcp/gsttcpclientsrc.c
+++ b/gst/tcp/gsttcpclientsrc.c
@@ -50,7 +50,7 @@ G_STMT_START {                                 \
 } G_STMT_END
 
 
-GST_DEBUG_CATEGORY (tcpclientsrc_debug);
+GST_DEBUG_CATEGORY_STATIC (tcpclientsrc_debug);
 #define GST_CAT_DEFAULT tcpclientsrc_debug
 
 #define MAX_READ_SIZE                   4 * 1024
diff --git a/gst/tcp/gsttcpserversink.c b/gst/tcp/gsttcpserversink.c
index 48ee073fd8..5b35b8c842 100644
--- a/gst/tcp/gsttcpserversink.c
+++ b/gst/tcp/gsttcpserversink.c
@@ -50,7 +50,7 @@ GST_ELEMENT_DETAILS ("TCP server sink",
     "Send data as a server over the network via TCP",
     "Thomas Vander Stichele <thomas at apestaart dot org>");
 
-GST_DEBUG_CATEGORY (tcpserversink_debug);
+GST_DEBUG_CATEGORY_STATIC (tcpserversink_debug);
 #define GST_CAT_DEFAULT (tcpserversink_debug)
 
 enum
diff --git a/gst/tcp/gsttcpserversrc.c b/gst/tcp/gsttcpserversrc.c
index 4cf9a9da09..1cd674c60f 100644
--- a/gst/tcp/gsttcpserversrc.c
+++ b/gst/tcp/gsttcpserversrc.c
@@ -50,7 +50,7 @@ G_STMT_START {                                 \
 } G_STMT_END
 
 
-GST_DEBUG_CATEGORY (tcpserversrc_debug);
+GST_DEBUG_CATEGORY_STATIC (tcpserversrc_debug);
 #define GST_CAT_DEFAULT tcpserversrc_debug
 
 #define TCP_DEFAULT_LISTEN_HOST         NULL    /* listen on all interfaces */
diff --git a/gst/videorate/gstvideorate.c b/gst/videorate/gstvideorate.c
index e45478b4a5..e10a6c0971 100644
--- a/gst/videorate/gstvideorate.c
+++ b/gst/videorate/gstvideorate.c
@@ -70,7 +70,7 @@
 
 #include "gstvideorate.h"
 
-GST_DEBUG_CATEGORY (video_rate_debug);
+GST_DEBUG_CATEGORY_STATIC (video_rate_debug);
 #define GST_CAT_DEFAULT video_rate_debug
 
 /* elementfactory information */
diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c
index 7821e8c8ad..f4796e693c 100644
--- a/gst/videotestsrc/gstvideotestsrc.c
+++ b/gst/videotestsrc/gstvideotestsrc.c
@@ -49,7 +49,7 @@
 
 #define USE_PEER_BUFFERALLOC
 
-GST_DEBUG_CATEGORY (video_test_src_debug);
+GST_DEBUG_CATEGORY_STATIC (video_test_src_debug);
 #define GST_CAT_DEFAULT video_test_src_debug
 
 
diff --git a/sys/v4l/gstv4ljpegsrc.c b/sys/v4l/gstv4ljpegsrc.c
index 372b7762e9..c640cb4278 100644
--- a/sys/v4l/gstv4ljpegsrc.c
+++ b/sys/v4l/gstv4ljpegsrc.c
@@ -36,7 +36,7 @@ GST_ELEMENT_DETAILS ("Video (video4linux/raw) Jpeg Source",
     "Reads jpeg frames from a video4linux (eg ov519) device",
     "Jan Schmidt <thaytan@mad.scientist.com>");
 
-GST_DEBUG_CATEGORY (v4ljpegsrc_debug);
+GST_DEBUG_CATEGORY_STATIC (v4ljpegsrc_debug);
 #define GST_CAT_DEFAULT v4ljpegsrc_debug
 
 /* init functions */
diff --git a/sys/v4l/gstv4lmjpegsink.c b/sys/v4l/gstv4lmjpegsink.c
index 07f0d0bd76..f0aced90a7 100644
--- a/sys/v4l/gstv4lmjpegsink.c
+++ b/sys/v4l/gstv4lmjpegsink.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include "v4lmjpegsink_calls.h"
 
-GST_DEBUG_CATEGORY (v4lmjpegsink_debug);
+GST_DEBUG_CATEGORY_STATIC (v4lmjpegsink_debug);
 #define GST_CAT_DEFAULT v4lmjpegsink_debug
 
 /* elementfactory information */
diff --git a/sys/v4l/gstv4lsrc.c b/sys/v4l/gstv4lsrc.c
index e595bf4387..564edb48ad 100644
--- a/sys/v4l/gstv4lsrc.c
+++ b/sys/v4l/gstv4lsrc.c
@@ -37,7 +37,7 @@ GST_ELEMENT_DETAILS ("Video (video4linux/raw) Source",
     "Ronald Bultje <rbultje@ronald.bitfreak.net>");
 
 
-GST_DEBUG_CATEGORY (v4lsrc_debug);
+GST_DEBUG_CATEGORY_STATIC (v4lsrc_debug);
 #define GST_CAT_DEFAULT v4lsrc_debug
 
 
diff --git a/tests/examples/seek/scrubby.c b/tests/examples/seek/scrubby.c
index 502e58d04f..f7121b87ce 100644
--- a/tests/examples/seek/scrubby.c
+++ b/tests/examples/seek/scrubby.c
@@ -4,7 +4,7 @@
 #include <gst/gst.h>
 #include <string.h>
 
-GST_DEBUG_CATEGORY (scrubby_debug);
+GST_DEBUG_CATEGORY_STATIC (scrubby_debug);
 #define GST_CAT_DEFAULT (scrubby_debug)
 
 static GstElement *pipeline;
diff --git a/tests/examples/seek/seek.c b/tests/examples/seek/seek.c
index f178ec413e..6650cda266 100644
--- a/tests/examples/seek/seek.c
+++ b/tests/examples/seek/seek.c
@@ -4,7 +4,7 @@
 #include <gst/gst.h>
 #include <string.h>
 
-GST_DEBUG_CATEGORY (seek_debug);
+GST_DEBUG_CATEGORY_STATIC (seek_debug);
 #define GST_CAT_DEFAULT (seek_debug)
 
 static GList *seekable_pads = NULL;