diff --git a/ChangeLog b/ChangeLog
index bbe6b16808..c832c25afe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-16  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* docs/libs/gst-plugins-base-libs-sections.txt:
+	* gst-libs/gst/cdda/gstcddabasesrc.h:
+	  Remove GST_CDDA_TAG_TRACK_TAGS again, it is #ifdef 0'ed
+	  out in the header file and shouldn't be listed in the docs.
+
+	* gst-libs/gst/riff/riff-read.c: (gst_riff_read_chunk):
+	  Fix it so that it doesn't crash in the debug statement.
+
 2006-06-16  Stefan Kost  <ensonic@users.sf.net>
 
 	* docs/libs/Makefile.am:
diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt
index 033c036d7f..2cb476b277 100644
--- a/docs/libs/gst-plugins-base-libs-sections.txt
+++ b/docs/libs/gst-plugins-base-libs-sections.txt
@@ -219,7 +219,6 @@ GST_TAG_CDDA_CDDB_DISCID
 GST_TAG_CDDA_CDDB_DISCID_FULL
 GST_TAG_CDDA_MUSICBRAINZ_DISCID
 GST_TAG_CDDA_MUSICBRAINZ_DISCID_FULL
-GST_TAG_CDDA_TRACK_TAGS
 <SUBSECTION Standard>
 GST_CDDA_BASE_SRC
 GST_CDDA_BASE_SRC_CLASS
diff --git a/gst-libs/gst/cdda/gstcddabasesrc.h b/gst-libs/gst/cdda/gstcddabasesrc.h
index 27813c81d3..7129082b4d 100644
--- a/gst-libs/gst/cdda/gstcddabasesrc.h
+++ b/gst-libs/gst/cdda/gstcddabasesrc.h
@@ -166,7 +166,7 @@ gboolean gst_cdda_base_src_add_track (GstCddaBaseSrc      * src,
 #define GST_TAG_CDDA_MUSICBRAINZ_DISCID_FULL  "musicbrainz-discid-full"
 
 #if 0
-/**
+/*
  * GST_TAG_CDDA_TRACK_TAGS:
  *
  * Tag details for all available tracks
diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c
index d867d9b43d..18d9de4cb2 100644
--- a/gst-libs/gst/riff/riff-read.c
+++ b/gst-libs/gst/riff/riff-read.c
@@ -69,7 +69,7 @@ skip_junk:
   gst_buffer_unref (buf);
 
   GST_DEBUG_OBJECT (element, "fourcc=%" GST_FOURCC_FORMAT ", size=%u",
-      GST_FOURCC_ARGS (tag), size);
+      GST_FOURCC_ARGS (*tag), size);
 
   /* skip 'JUNK' chunks */
   if (*tag == GST_RIFF_TAG_JUNK) {