diff -Nru unity-gtk-module-0.0.0+16.10.20160805/data/Makefile.am unity-gtk-module-0.0.0+16.10.20160913/data/Makefile.am
--- unity-gtk-module-0.0.0+16.10.20160805/data/Makefile.am	2016-08-05 10:44:31.000000000 +0000
+++ unity-gtk-module-0.0.0+16.10.20160913/data/Makefile.am	2016-09-13 15:26:27.000000000 +0000
@@ -10,7 +10,4 @@
 systemd_userunitdir = $(SYSTEMD_USERUNITDIR)
 systemd_userunit_DATA = unity-gtk-module.service
 
-upstart_systemd_overridedir = $(datadir)/upstart/systemd-session/upstart/
-upstart_systemd_override_DATA = unity-gtk-module.override
-
 EXTRA_DIST = $(dist_upstart_job_DATA)
diff -Nru unity-gtk-module-0.0.0+16.10.20160805/data/unity-gtk-module.override unity-gtk-module-0.0.0+16.10.20160913/data/unity-gtk-module.override
--- unity-gtk-module-0.0.0+16.10.20160805/data/unity-gtk-module.override	2016-08-05 10:44:31.000000000 +0000
+++ unity-gtk-module-0.0.0+16.10.20160913/data/unity-gtk-module.override	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-manual
diff -Nru unity-gtk-module-0.0.0+16.10.20160805/data/unity-gtk-module.service unity-gtk-module-0.0.0+16.10.20160913/data/unity-gtk-module.service
--- unity-gtk-module-0.0.0+16.10.20160805/data/unity-gtk-module.service	2016-08-05 10:44:31.000000000 +0000
+++ unity-gtk-module-0.0.0+16.10.20160913/data/unity-gtk-module.service	2016-09-13 15:26:27.000000000 +0000
@@ -8,12 +8,10 @@
 RemainAfterExit=yes
 ExecStart=/bin/sh -ec '\
         GTK_MODULES="$${GTK_MODULES:+$GTK_MODULES:}unity-gtk-module";\
-        dbus-update-activation-environment --verbose --systemd GTK_MODULES;\
-        initctl set-env --global GTK_MODULES=$${GTK_MODULES} || true'
+        dbus-update-activation-environment --verbose --systemd GTK_MODULES'
 ExecStopPost=/bin/sh -ec '\
         GTK_MODULES=$$(echo -n $${GTK_MODULES} | awk -v RS=: -v ORS=: "/^unity-gtk-module$/ {next} {print}" | sed -e "s/:*$//");\
-        dbus-update-activation-environment --verbose --systemd GTK_MODULES;\
-        initctl set-env --global GTK_MODULES=$${GTK_MODULES} || true'
+        dbus-update-activation-environment --verbose --systemd GTK_MODULES'
 
 [Install]
 WantedBy=ubuntu-session.target
diff -Nru unity-gtk-module-0.0.0+16.10.20160805/debian/changelog unity-gtk-module-0.0.0+16.10.20160913/debian/changelog
--- unity-gtk-module-0.0.0+16.10.20160805/debian/changelog	2016-09-13 15:29:17.000000000 +0000
+++ unity-gtk-module-0.0.0+16.10.20160913/debian/changelog	2016-09-13 15:29:17.000000000 +0000
@@ -1,3 +1,9 @@
+unity-gtk-module (0.0.0+16.10.20160913-0ubuntu1) yakkety; urgency=medium
+
+  * Fix $GTK_MODULES race condition (LP: #1618886)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 13 Sep 2016 15:27:01 +0000
+
 unity-gtk-module (0.0.0+16.10.20160805-0ubuntu1) yakkety; urgency=medium
 
   [ Iain Lane ]
diff -Nru unity-gtk-module-0.0.0+16.10.20160805/debian/control unity-gtk-module-0.0.0+16.10.20160913/debian/control
--- unity-gtk-module-0.0.0+16.10.20160805/debian/control	2016-09-13 15:29:17.000000000 +0000
+++ unity-gtk-module-0.0.0+16.10.20160913/debian/control	2016-09-13 15:29:17.000000000 +0000
@@ -13,8 +13,8 @@
 # If you aren't a member of ~indicator-applet-developers but need to upload
 # packaging changes, just go ahead.  ~indicator-applet-developers will notice
 # and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/unity-gtk-module/trunk
-Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/unity-gtk-module/trunk/files
+Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/unity-gtk-module/trunk.15.04
+Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/unity-gtk-module/trunk.15.04
 
 Package: libunity-gtk-parser-dev-common
 Section: libdevel