=== modified file 'debian/changelog'
--- debian/changelog	2013-11-18 15:06:56 +0000
+++ debian/changelog	2013-11-18 15:29:18 +0000
@@ -1,3 +1,11 @@
+dbus (1.6.18-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/dbus.user-session.upstart: Communicate session bus to Upstart
+    Session Init to avoid potential out-of-memory scenario triggered by
+    Upstart clients that do not run main loops (LP: #1235649, LP: #1252317).
+
+ -- James Hunt <james.hunt@ubuntu.com>  Mon, 18 Nov 2013 15:20:51 +0000
+
 dbus (1.6.18-0ubuntu1) trusty; urgency=low
 
   * New upstream version

=== modified file 'debian/dbus.user-session.upstart'
--- debian/dbus.user-session.upstart	2013-11-18 15:06:56 +0000
+++ debian/dbus.user-session.upstart	2013-11-18 15:07:49 +0000
@@ -13,4 +13,6 @@
     echo "DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}" >$HOME/.cache/upstart/dbus-session
 end script
 
-exec dbus-daemon --fork --session --address=$DBUS_SESSION_BUS_ADDRESS
+exec dbus-daemon --fork --session --address="$DBUS_SESSION_BUS_ADDRESS"
+
+post-start exec initctl notify-dbus-address "$DBUS_SESSION_BUS_ADDRESS"