diff --git a/ChangeLog b/ChangeLog
index e7c8037d55..5932d1113b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-03  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+	* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps):
+	Give the TrueSpeech audio codec a proper caps. This is now synchronized
+	with libriff in -base cvs.
+
 2008-08-31  Edward Hervey  <edward.hervey@collabora.co.uk>
 
 	* configure.ac:
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 8046737f90..bf93ec593a 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -774,6 +774,10 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
     caps = gst_ff_vid_caps_new (context, codec_id, "video/x-vmnc", NULL);
     break;
 
+    case CODEC_ID_TRUESPEECH:
+    caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-truespeech", NULL);
+    break;
+
     case CODEC_ID_WS_VQA:
     case CODEC_ID_IDCIN:
     case CODEC_ID_8BPS:
@@ -800,7 +804,6 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
     case CODEC_ID_MMVIDEO:
     case CODEC_ID_ZMBV:
     case CODEC_ID_AVS:
-    case CODEC_ID_TRUESPEECH:
     case CODEC_ID_CAVS:
       buildcaps = TRUE;
       break;