diff -Nru policykit-1-gnome-0.105/debian/changelog policykit-1-gnome-0.105/debian/changelog
--- policykit-1-gnome-0.105/debian/changelog	2016-12-11 01:21:53.000000000 +0000
+++ policykit-1-gnome-0.105/debian/changelog	2017-01-08 22:57:53.000000000 +0000
@@ -1,4 +1,10 @@
-policykit-1-gnome (0.105-5ubuntu1) zesty; urgency=medium
+policykit-1-gnome (0.105-6ubuntu2) zesty; urgency=medium
+
+  * Fix typo
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 08 Jan 2017 17:57:53 -0500
+
+policykit-1-gnome (0.105-6ubuntu1) zesty; urgency=medium
 
   * Merge from Debian unstable. Remaining changes:
     - 04-autorestart.patch: Add gnome session restart support to ensure we
@@ -16,7 +22,17 @@
       agent in case of failure.
     - add dh --with translations
 
- -- Jeremy Bicha <jbicha@ubuntu.com>  Sat, 10 Dec 2016 20:21:53 -0500
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 08 Jan 2017 17:07:51 -0500
+
+policykit-1-gnome (0.105-6) unstable; urgency=medium
+
+  * Move the binary back to /usr/lib/policykit-1-gnome.
+    This avoids unnecessary churn when upgrading from Jessie.
+  * Start the authentication agent under Cinnamon.
+    Cinnamon does not have its own built-in autentication agent.
+    Update the package description accordingly. (Closes: #846245)
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 07 Jan 2017 19:39:22 +0100
 
 policykit-1-gnome (0.105-5) unstable; urgency=medium
 
diff -Nru policykit-1-gnome-0.105/debian/control policykit-1-gnome-0.105/debian/control
--- policykit-1-gnome-0.105/debian/control	2016-12-11 01:21:53.000000000 +0000
+++ policykit-1-gnome-0.105/debian/control	2017-01-08 22:57:53.000000000 +0000
@@ -16,8 +16,7 @@
                libpolkit-gobject-1-dev (>= 0.97),
                pkg-config
 Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-utopia/policykit-gnome.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-utopia/policykit-gnome.git/
+Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/policykit-1-gnome/ubuntu
 Homepage: https://wiki.gnome.org/Projects/PolicyKit
 
 Package: policykit-1-gnome
@@ -27,12 +26,12 @@
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: polkit-1-auth-agent
-Description: XFCE and Unity authentication agent for PolicyKit-1
+Description: authentication agent for PolicyKit
  PolicyKit-gnome provides a D-Bus session bus service that is used to
  bring up authentication dialogs used for obtaining privileges.
  .
  This implementation was originally designed for GNOME 2, but most
  GNOME-based desktop environments, including GNOME 3, GNOME Flashback,
- MATE and Cinnamon, have their own built-in PolicyKit agents and no
- longer use this one. The remaining users of this implementation
- are XFCE and Unity.
+ and MATE, have their own built-in PolicyKit agents and no longer use
+ this one. The remaining users of this implementation are Cinnamon, XFCE
+ and Unity.
diff -Nru policykit-1-gnome-0.105/debian/polkit-gnome-authentication-agent-1.desktop policykit-1-gnome-0.105/debian/polkit-gnome-authentication-agent-1.desktop
--- policykit-1-gnome-0.105/debian/polkit-gnome-authentication-agent-1.desktop	2016-12-11 01:21:53.000000000 +0000
+++ policykit-1-gnome-0.105/debian/polkit-gnome-authentication-agent-1.desktop	2017-01-08 22:57:53.000000000 +0000
@@ -79,11 +79,11 @@
 Comment[zh_CN]=PolicyKit 认证代理
 Comment[zh_HK]=PolicyKit 驗證代理程式
 Comment[zh_TW]=PolicyKit 驗證代理程式
-Exec=/usr/lib/polkit-gnome-authentication-agent-1
+Exec=/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
 Terminal=false
 Type=Application
 Categories=
 NoDisplay=true
-OnlyShowIn=XFCE;Unity;
+OnlyShowIn=XFCE;Unity;X-Cinnamon;
 X-GNOME-AutoRestart=true
 AutostartCondition=GNOME3 unless-session gnome
diff -Nru policykit-1-gnome-0.105/debian/rules policykit-1-gnome-0.105/debian/rules
--- policykit-1-gnome-0.105/debian/rules	2016-12-11 01:21:53.000000000 +0000
+++ policykit-1-gnome-0.105/debian/rules	2017-01-08 22:57:53.000000000 +0000
@@ -10,7 +10,7 @@
 		--disable-examples \
 		--enable-gtk-doc \
 		--disable-introspection \
-		--libexecdir=/usr/lib \
+		--libexecdir=/usr/lib/policykit-1-gnome \
 		${NULL}
 
 override_dh_auto_test: