diff -u cmus-2.2.0/debian/changelog cmus-2.2.0/debian/changelog
--- cmus-2.2.0/debian/changelog
+++ cmus-2.2.0/debian/changelog
@@ -1,3 +1,11 @@
+cmus (2.2.0-3ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #313034
+    - ffmpeg.c: use correct headers location to fix FTBFS with recent ffmpeg
+      snapshots
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Fri, 02 Jan 2009 06:16:33 +0530
+
 cmus (2.2.0-3) unstable; urgency=low
 
   * Acknowledging NMU.  Closes: #509277.
@@ -12,6 +20,14 @@
 
  -- Carlos Eduardo Sotelo Pinto (krlos) <krlos.aqp@gmail.com>  Wed, 03 Sep 2008 17:46:50 -0500
 
+cmus (2.2.0-1.1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable (LP: #312215), Ubuntu remaining changes:
+    - ffmpeg.c: use correct headers location to fix FTBFS with recent ffmpeg
+      snapshots (LP: #311007).
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Mon, 29 Dec 2008 17:36:47 +0100
+
 cmus (2.2.0-1.1) unstable; urgency=high
 
   * Non-maintainer upload by the Security Team.
@@ -22,6 +38,25 @@
 
  -- Moritz Muehlenhoff <jmm@debian.org>  Sun, 28 Dec 2008 14:57:06 +0100
 
+cmus (2.2.0-1ubuntu1) jaunty; urgency=low
+
+  * ffmpeg.c: use correct headers location to fix FTBFS with recent ffmpeg
+    snapshots (LP: #311007).
+
+ -- Lionel Le Folgoc <mrpouit@ubuntu.com>  Fri, 26 Dec 2008 13:08:26 +0100
+
+cmus (2.2.0-1build2) jaunty; urgency=low
+
+  * Rebuild to pickup ffmpeg's new shlibs (LP: #289600).
+
+ -- Lionel Le Folgoc <mrpouit@ubuntu.com>  Thu, 06 Nov 2008 22:16:39 +0100
+
+cmus (2.2.0-1build1) intrepid; urgency=low
+
+  * Rebuild for ffmpeg -> ffmpeg-free transition (LP: #245576). 
+
+ -- Michael Bienia <geser@ubuntu.com>  Tue, 08 Jul 2008 16:02:28 +0200
+
 cmus (2.2.0-1) unstable; urgency=low
 
   * New upstream release
diff -u cmus-2.2.0/debian/control cmus-2.2.0/debian/control
--- cmus-2.2.0/debian/control
+++ cmus-2.2.0/debian/control
@@ -1,7 +1,8 @@
 Source: cmus
 Section: sound
 Priority: optional
-Maintainer: Carlos Eduardo Sotelo Pinto (krlos) <krlos.aqp@gmail.com>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Julien Louis <ptitlouis@sysif.net>
 Build-Depends: debhelper (>= 5.0.0), libflac-dev, libncursesw5-dev,
  libmodplug-dev, libmad0-dev, libvorbis-dev, libasound2-dev (>= 1.0.11) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libmpcdec-dev, libartsc0-dev, libao-dev, libfaad-dev, libwavpack-dev, libavformat-dev
only in patch2:
unchanged:
--- cmus-2.2.0.orig/ffmpeg.c
+++ cmus-2.2.0/ffmpeg.c
@@ -18,9 +18,9 @@
  */
 
 #include <stdio.h>
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avio.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
 
 #include "ip.h"
 #include "xmalloc.h"