diff --git a/ChangeLog b/ChangeLog
index eb1259ce77..1e8a4cd36e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-04  Benjamin Otte  <otte@gnome.org>
+
+	* configure.ac:
+	  check for kdemacros.h, too (should fix #141821)
+	* ext/vorbis/vorbisdec.c: (vorbis_dec_event), (vorbis_dec_chain):
+	  don't crash if no header was sent, but nicely error out (fixes part
+	  of #141554)
+
 2004-05-04  Wim Taymans  <wim@fluendo.com>
 
 	* ext/mpeg2enc/gstmpeg2enc.cc: (gst_mpeg2enc_dispose): call the
diff --git a/configure.ac b/configure.ac
index 6d9b3306fd..7027639d9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1066,7 +1066,7 @@ GST_CHECK_FEATURE(KIO, [kio], kio, [
   fi
 
   for dir in $kde_include_dirs; do
-    if test -r "$dir/kglobal.h"; then
+    if test -r "$dir/kglobal.h" && test -r "$dir/kdemacros.h"; then
       kde_include_dir=$dir
       break
     fi
diff --git a/ext/vorbis/vorbisdec.c b/ext/vorbis/vorbisdec.c
index f7da654ec9..d0fd119de0 100644
--- a/ext/vorbis/vorbisdec.c
+++ b/ext/vorbis/vorbisdec.c
@@ -395,6 +395,12 @@ vorbis_dec_chain (GstPad * pad, GstData * data)
     float **pcm;
     guint sample_count;
 
+    if (packet.packetno < 3) {
+      GST_ELEMENT_ERROR (GST_ELEMENT (vd), STREAM, DECODE,
+          (NULL), ("no header sent yet (packet no is %d)", packet.packetno));
+      gst_data_unref (data);
+      return;
+    }
     /* normal data packet */
     if (vorbis_synthesis (&vd->vb, &packet)) {
       GST_ELEMENT_ERROR (GST_ELEMENT (vd), STREAM, DECODE,