diff -Nru im-config-0.29/debian/changelog im-config-0.29/debian/changelog
--- im-config-0.29/debian/changelog	2016-10-04 01:44:00.000000000 +0000
+++ im-config-0.29/debian/changelog	2016-10-04 11:28:35.000000000 +0000
@@ -1,3 +1,19 @@
+im-config (0.29-1ubuntu16) yakkety; urgency=medium
+
+  * debian/user/im-config.service: Reverse the order of "initctl set-env" and
+    "dbus-update-activation-environment". $XMODIFIERS can contain an "=" (its
+    value might be, for example, "@im=ibus"). upstart forwards "set-env -g"
+    calls to D-Bus, but it constructs the parameters to the call incorrectly
+    and splits on "=" characters in the value, discarding anything which
+    follows. We can work around this bug by calling "initctl set-env -g"
+    first, and then "dbus-update-activation-environment" to overwrite the
+    buggy value. (LP: #1630090)
+  * debian/user/im-config.service: Get rid of one eval -
+    "dbus-update-activation-environment" will look up the variable in the
+    environment if you don't specify a value.
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Tue, 04 Oct 2016 12:28:35 +0100
+
 im-config (0.29-1ubuntu15) yakkety; urgency=medium
 
   * debian/patches/01-ubuntu-default-mode.patch:
diff -Nru im-config-0.29/debian/user/im-config.service im-config-0.29/debian/user/im-config.service
--- im-config-0.29/debian/user/im-config.service	2016-07-19 18:05:10.000000000 +0000
+++ im-config-0.29/debian/user/im-config.service	2016-10-04 11:28:35.000000000 +0000
@@ -15,7 +15,7 @@
             . $$IM_CONFIG_XINPUTRC_SYS; \
         fi; \
         for v in XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT4_IM_MODULE CLUTTER_IM_MODULE; do \
-            dbus-update-activation-environment --systemd $$v=$$(eval "echo \\$$$${v}"); \
             initctl set-env -gr $$v=$$(eval "echo \\$$$${v}") || true; \
+            dbus-update-activation-environment --systemd $$v; \
         done; \
     fi'