diff -Nru at-spi2-core-2.16.0/debian/at-spi2-registryd.conf at-spi2-core-2.16.0/debian/at-spi2-registryd.conf
--- at-spi2-core-2.16.0/debian/at-spi2-registryd.conf	2014-10-13 08:21:53.000000000 +0000
+++ at-spi2-core-2.16.0/debian/at-spi2-registryd.conf	2015-05-18 04:40:48.000000000 +0000
@@ -9,5 +9,4 @@
          = "true" ] || exit 0
 end script
 
-respawn
 exec /usr/lib/at-spi2-core/at-spi-bus-launcher --launch-immediately
diff -Nru at-spi2-core-2.16.0/debian/changelog at-spi2-core-2.16.0/debian/changelog
--- at-spi2-core-2.16.0/debian/changelog	2015-04-03 01:06:38.000000000 +0000
+++ at-spi2-core-2.16.0/debian/changelog	2015-05-26 14:50:25.000000000 +0000
@@ -1,15 +1,24 @@
-at-spi2-core (2.16.0-0ubuntu1~vivid1) vivid; urgency=medium
+at-spi2-core (2.16.0-1ubuntu1~vivid1) vivid; urgency=medium
 
-  * New upstream release
+  * Copied from wily
 
- -- Jackson Doak <noskcaj@ubuntu.com>  Fri, 03 Apr 2015 12:06:15 +1100
+ -- Rico Tzschichholz <ricotz@ubuntu.com>  Tue, 26 May 2015 16:50:25 +0200
 
-at-spi2-core (2.14.0-1ubuntu2) vivid; urgency=medium
+at-spi2-core (2.16.0-1ubuntu1) wily; urgency=medium
 
-  * No change rebuild to account for dbus-daemon moving from /bin/ to
-    /usr/bin.
+  * Merge from Debian unstable, remaining changes:
+    - Load the at-spi2 registry as part of the Ubuntu upstart user session
+  * Remove respawn keyword from upstart file, the service gets restarted via
+    dbus if required (LP: #1228567)
 
- -- Dimitri John Ledkov <dimitri.j.ledkov@linux.intel.com>  Wed, 04 Mar 2015 10:28:38 +0000
+ -- Luke Yelavich <themuso@ubuntu.com>  Mon, 18 May 2015 14:43:06 +1000
+
+at-spi2-core (2.16.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * No longer Build-Depends on hardening-wrapper.
+
+ -- Mario Lang <mlang@debian.org>  Tue, 05 May 2015 13:22:27 +0200
 
 at-spi2-core (2.14.0-1ubuntu1) vivid; urgency=medium
 
diff -Nru at-spi2-core-2.16.0/debian/control at-spi2-core-2.16.0/debian/control
--- at-spi2-core-2.16.0/debian/control	2014-10-13 08:21:53.000000000 +0000
+++ at-spi2-core-2.16.0/debian/control	2015-05-18 04:40:48.000000000 +0000
@@ -14,8 +14,7 @@
                libxtst-dev,
                libgirepository1.0-dev,
                gtk-doc-tools (>= 1.09),
-               gobject-introspection,
-               hardening-wrapper
+               gobject-introspection
 Standards-Version: 3.9.6
 
 Package: at-spi2-core
diff -Nru at-spi2-core-2.16.0/debian/rules at-spi2-core-2.16.0/debian/rules
--- at-spi2-core-2.16.0/debian/rules	2014-10-13 08:21:53.000000000 +0000
+++ at-spi2-core-2.16.0/debian/rules	2015-05-18 04:40:48.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-export DEB_BUILD_HARDENING=1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
 	dh $@ --with autoreconf