diff -Nru freeradius-3.0.12+dfsg/debian/changelog freeradius-3.0.12+dfsg/debian/changelog
--- freeradius-3.0.12+dfsg/debian/changelog	2016-11-18 16:26:11.000000000 +0000
+++ freeradius-3.0.12+dfsg/debian/changelog	2016-12-22 13:34:07.000000000 +0000
@@ -1,8 +1,25 @@
-freeradius (3.0.12+dfsg-4~gd~y) yakkety; urgency=medium
+freeradius (3.0.12+dfsg-4ubuntu1~gd~y) yakkety; urgency=medium
 
   * No-change backport to yakkety
 
- -- Fabio Pedretti <fmrummey@gmail.com>  Fri, 18 Nov 2016 17:26:11 +0100
+ -- Fabio Pedretti <fmrummey@gmail.com>  Thu, 22 Dec 2016 14:34:07 +0100
+
+freeradius (3.0.12+dfsg-4ubuntu1) zesty; urgency=medium
+
+  * Merge with Debian unstable (LP: #1647579). Remaining changes:
+    - d/control: drop b-d on collectd, as it is in universe (LP #1522040).
+  * Drop:
+    - d/t: update tests for 3.x (Closes #710895)
+      + Password must be provided as 'User-Password'.
+      + Configuration is stored in /etc/freeradius/3.0/.
+      + Response strings do not contain 'code X' any longer.
+    [ Fixed in Debian ]
+    - d/freeradius.postinst: revert incorrect removal of /var/log file creation
+      + 42abc545 ('Remove all use of dpkg-statoverride') included a
+        non-dpkg-statoverride-related removal.
+    [ Fixed in Debian ]
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Tue, 06 Dec 2016 09:12:44 +0100
 
 freeradius (3.0.12+dfsg-4) unstable; urgency=medium
 
@@ -17,6 +34,24 @@
 
  -- Michael Stapelberg <stapelberg@debian.org>  Thu, 17 Nov 2016 22:29:04 +0100
 
+freeradius (3.0.12+dfsg-3ubuntu2) zesty; urgency=medium
+
+  * d/t: update tests for 3.x (Closes: #710895)
+    - Password must be provided as 'User-Password'.
+    - Configuration is stored in /etc/freeradius/3.0/.
+    - Response strings do not contain 'code X' any longer.
+  * d/freeradius.postinst: revert incorrect removal of /var/log file creation
+    - 42abc545 ('Remove all use of dpkg-statoverride') included a
+      non-dpkg-statoverride-related removal.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Thu, 17 Nov 2016 11:04:34 -0800
+
+freeradius (3.0.12+dfsg-3ubuntu1) zesty; urgency=medium
+
+  * d/control: drop b-d on collectd, as it is in universe (LP: #1522040).
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Fri, 11 Nov 2016 17:46:15 -0800
+
 freeradius (3.0.12+dfsg-3) unstable; urgency=medium
 
   * update debian/patches/openssl-1.1.diff to fix compilation with older
diff -Nru freeradius-3.0.12+dfsg/debian/control freeradius-3.0.12+dfsg/debian/control
--- freeradius-3.0.12+dfsg/debian/control	2016-11-17 21:29:04.000000000 +0000
+++ freeradius-3.0.12+dfsg/debian/control	2016-12-06 08:12:44.000000000 +0000
@@ -28,12 +28,12 @@
  python-dev,
  samba-dev | samba4-dev,
  libpcre3-dev,
- libcollectdclient-dev [!mips64el],
  snmp,
  dh-autoreconf
 Section: net
 Priority: optional
-Maintainer: Debian FreeRADIUS Packaging Team <pkg-freeradius-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian FreeRADIUS Packaging Team <pkg-freeradius-maintainers@lists.alioth.debian.org>
 Uploaders: Josip Rodin <joy-packages@debian.org>,
  Stephen Gran <sgran@debian.org>,
  Mark Hymers <mhy@debian.org>,