diff --git a/ChangeLog b/ChangeLog
index 395690aef9..4e6e9fbde9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-01-04  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register):
+	* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register):
+	Don't register the WavPack demuxer and decoder. They don't work,
+	we have better ones and the output of the demuxer/input of the
+	decoder is in a different format than what audio/x-wavpack of the
+	wavpack plugin is (it seems that the demuxer strips of the wavpack
+	headers from every frame).
+
+	This fixes typefinding of Wavpack files again, as the ffmpeg
+	typefinder was preffered for some reason and gave
+	application/x-gst_ff-wv instead of audio/x-wavpack.
+
 2007-12-18  Edward Hervey  <edward.hervey@collabora.co.uk>
 
 	* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_loop):
diff --git a/common b/common
index 67b8f4e3c5..970759077c 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 67b8f4e3c576945f4d778c9040876af3a5a0756e
+Subproject commit 970759077c95ee4e85650db023ac6f974e2aa5e1
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 39f21075a8..ac4b6272e5 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -498,7 +498,7 @@ gst_ffmpegdec_open (GstFFMpegDec * ffmpegdec)
     case CODEC_ID_MPEG4:
     case CODEC_ID_MJPEG:
     case CODEC_ID_MP3:
-  case CODEC_ID_VC1:
+    case CODEC_ID_VC1:
       GST_LOG_OBJECT (ffmpegdec, "not using parser, blacklisted codec");
       ffmpegdec->pctx = NULL;
       break;
@@ -695,7 +695,7 @@ gst_ffmpegdec_get_buffer (AVCodecContext * context, AVFrame * picture)
 
   switch (context->codec_type) {
     case CODEC_TYPE_VIDEO:
-    /* some ffmpeg video plugins don't see the point in setting codec_type ... */
+      /* some ffmpeg video plugins don't see the point in setting codec_type ... */
     case CODEC_TYPE_UNKNOWN:
       avcodec_align_dimensions (context, &width, &height);
 
@@ -2272,6 +2272,7 @@ gst_ffmpegdec_register (GstPlugin * plugin)
     if (!strcmp (in_plugin->name, "gif") ||
         !strcmp (in_plugin->name, "vorbis") ||
         !strcmp (in_plugin->name, "mpeg1video") ||
+        !strcmp (in_plugin->name, "wavpack") ||
         !strcmp (in_plugin->name, "mp2")) {
       GST_LOG ("Ignoring decoder %s", in_plugin->name);
       goto next;
diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index b14311dcfa..d7b6b260d2 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -1521,7 +1521,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
 
     /* these don't do what one would expect or
      * are only partially functional/useful */
-    if (!strcmp (in_plugin->name, "aac"))
+    if (!strcmp (in_plugin->name, "aac") || !strcmp (in_plugin->name, "wv"))
       goto next;
 
     /* Don't use the typefind functions of formats for which we already have