=== modified file 'debian/changelog'
--- debian/changelog	2016-07-13 01:32:29 +0000
+++ debian/changelog	2016-07-13 02:34:49 +0000
@@ -1,3 +1,10 @@
+freerdp (1.1.0~git20140921.1.440916e+dfsg1-10ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge with Debian (LP: #1602480). Remaining change:
+    - Disable ffmpeg support (it's in universe)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 12 Jul 2016 21:30:01 -0400
+
 freerdp (1.1.0~git20140921.1.440916e+dfsg1-10) unstable; urgency=medium
 
   * debian/rules:

=== modified file 'debian/control'
--- debian/control	2016-07-13 01:32:29 +0000
+++ debian/control	2016-07-13 02:34:52 +0000
@@ -1,7 +1,8 @@
 Source: freerdp
 Section: x11
 Priority: optional
-Maintainer: Mike Gabriel <sunweaver@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Mike Gabriel <sunweaver@debian.org>
 Uploaders:
  Otavio Salvador <otavio@debian.org>,
  Laszlo Boszormenyi (GCS) <gcs@debian.hu>,
@@ -27,7 +28,7 @@
  libjpeg-dev,
  pkg-config,
  xmlto,
- libavcodec-dev,
+# libavcodec-dev,
  libxi-dev,
  libusb-1.0-0-dev [linux-any],
  libudev-dev [linux-any],

=== modified file 'debian/rules'
--- debian/rules	2016-07-13 01:32:29 +0000
+++ debian/rules	2016-07-13 02:34:49 +0000
@@ -33,6 +33,7 @@
                           -DWITH_SERVER=OFF \
                           -DWITH_PULSE=ON \
                           -DWITH_GSTREAMER=OFF \
+                          -DWITH_FFMPEG=OFF \
                           -DWITH_CHANNELS=ON \
                           -DSTATIC_CHANNELS=off \
                           -DWITH_CUPS=on \