diff -Nru indicator-bluetooth-0.0.6+14.04.20140207/configure.ac indicator-bluetooth-0.0.6+14.10.20141006/configure.ac
--- indicator-bluetooth-0.0.6+14.04.20140207/configure.ac	2014-02-07 16:19:18.000000000 +0000
+++ indicator-bluetooth-0.0.6+14.10.20141006/configure.ac	2014-10-06 17:22:11.000000000 +0000
@@ -59,6 +59,7 @@
 AC_OUTPUT([
 Makefile
 data/Makefile
+data/upstart/Makefile
 po/Makefile.in
 src/Makefile
 ])
diff -Nru indicator-bluetooth-0.0.6+14.04.20140207/data/com.canonical.indicator.bluetooth indicator-bluetooth-0.0.6+14.10.20141006/data/com.canonical.indicator.bluetooth
--- indicator-bluetooth-0.0.6+14.04.20140207/data/com.canonical.indicator.bluetooth	2014-02-07 16:19:18.000000000 +0000
+++ indicator-bluetooth-0.0.6+14.10.20141006/data/com.canonical.indicator.bluetooth	2014-10-06 17:22:30.000000000 +0000
@@ -8,10 +8,12 @@
 
 [phone]
 ObjectPath=/com/canonical/indicator/bluetooth/phone
+Position=36
 
 [ubiquity]
 ObjectPath=/com/canonical/indicator/bluetooth/desktop
 
 [phone_greeter]
 ObjectPath=/com/canonical/indicator/bluetooth/phone
+Position=36
 
diff -Nru indicator-bluetooth-0.0.6+14.04.20140207/data/indicator-bluetooth.conf.in indicator-bluetooth-0.0.6+14.10.20141006/data/indicator-bluetooth.conf.in
--- indicator-bluetooth-0.0.6+14.04.20140207/data/indicator-bluetooth.conf.in	2014-02-07 16:19:18.000000000 +0000
+++ indicator-bluetooth-0.0.6+14.10.20141006/data/indicator-bluetooth.conf.in	2014-10-06 17:22:11.000000000 +0000
@@ -1,11 +1,9 @@
 description "Indicator Bluetooth Backend"
 
-# Want to move to indicator-services-[start|end], but that's not all
-# there yet. Use the signals that exist today for now.
-
-start on indicators-loaded or indicator-services-start
+start on indicator-services-start
 stop on desktop-end or indicator-services-end
 
 respawn
+respawn limit 2 10
 
 exec @pkglibexecdir@/indicator-bluetooth-service
diff -Nru indicator-bluetooth-0.0.6+14.04.20140207/data/indicator-bluetooth.desktop.in indicator-bluetooth-0.0.6+14.10.20141006/data/indicator-bluetooth.desktop.in
--- indicator-bluetooth-0.0.6+14.04.20140207/data/indicator-bluetooth.desktop.in	2014-02-07 16:19:18.000000000 +0000
+++ indicator-bluetooth-0.0.6+14.10.20141006/data/indicator-bluetooth.desktop.in	2014-10-06 17:22:11.000000000 +0000
@@ -5,3 +5,5 @@
 NoDisplay=true
 StartupNotify=false
 Terminal=false
+OnlyShowIn=Unity;GNOME;
+AutostartCondition=GNOME3 unless-session gnome
diff -Nru indicator-bluetooth-0.0.6+14.04.20140207/data/indicator-bluetooth.upstart.desktop.in indicator-bluetooth-0.0.6+14.10.20141006/data/indicator-bluetooth.upstart.desktop.in
--- indicator-bluetooth-0.0.6+14.04.20140207/data/indicator-bluetooth.upstart.desktop.in	2014-02-07 16:19:18.000000000 +0000
+++ indicator-bluetooth-0.0.6+14.10.20141006/data/indicator-bluetooth.upstart.desktop.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Bluetooth
-Exec=@pkglibexecdir@/indicator-bluetooth-service
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-Hidden=true
diff -Nru indicator-bluetooth-0.0.6+14.04.20140207/data/Makefile.am indicator-bluetooth-0.0.6+14.10.20141006/data/Makefile.am
--- indicator-bluetooth-0.0.6+14.04.20140207/data/Makefile.am	2014-02-07 16:19:18.000000000 +0000
+++ indicator-bluetooth-0.0.6+14.10.20141006/data/Makefile.am	2014-10-06 17:22:11.000000000 +0000
@@ -2,6 +2,8 @@
 EXTRA_DIST =
 CLEANFILES =
 
+SUBDIRS = upstart
+
 # the indicator bus file
 indicatorsdir = $(datadir)/unity/indicators
 dist_indicators_DATA = com.canonical.indicator.bluetooth
@@ -16,17 +18,6 @@
 EXTRA_DIST += $(upstart_jobs_in)
 CLEANFILES += $(upstart_jobs_DATA)
 
-# the upstart version of the xdg autostart job file
-# see https://code.launchpad.net/~charlesk/indicator-bluetooth/upstart-job/+merge/198100
-upstart_xdg_autostartdir = $(datadir)/upstart/xdg/autostart
-upstart_xdg_autostart_DATA = indicator-bluetooth.desktop
-upstart_xdg_autostart_in = indicator-bluetooth.upstart.desktop.in
-$(upstart_xdg_autostart_DATA): $(upstart_xdg_autostart_in)
-	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-BUILT_SOURCES += $(upstart_xdg_autostart_DATA)
-EXTRA_DIST += $(upstart_xdg_autostart_in)
-CLEANFILES += $(upstart_xdg_autostart_DATA)
-
 # the xdg autostart job file
 xdg_autostartdir = /etc/xdg/autostart
 xdg_autostart_DATA = indicator-bluetooth.desktop
@@ -45,8 +36,7 @@
 EXTRA_DIST += \
   com.canonical.indicator.bluetooth.gschema.xml.in \
   indicator-bluetooth.conf.in \
-  indicator-bluetooth.desktop.in \
-  indicator-bluetooth.upstart.desktop.in
+  indicator-bluetooth.desktop.in
 
 CLEANFILES += \
   $(dbus_services_DATA) \
diff -Nru indicator-bluetooth-0.0.6+14.04.20140207/data/upstart/indicator-bluetooth.desktop.in indicator-bluetooth-0.0.6+14.10.20141006/data/upstart/indicator-bluetooth.desktop.in
--- indicator-bluetooth-0.0.6+14.04.20140207/data/upstart/indicator-bluetooth.desktop.in	1970-01-01 00:00:00.000000000 +0000
+++ indicator-bluetooth-0.0.6+14.10.20141006/data/upstart/indicator-bluetooth.desktop.in	2014-10-06 17:22:11.000000000 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Bluetooth
+Exec=@pkglibexecdir@/indicator-bluetooth-service
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+OnlyShowIn=Unity;
+Hidden=true
diff -Nru indicator-bluetooth-0.0.6+14.04.20140207/data/upstart/Makefile.am indicator-bluetooth-0.0.6+14.10.20141006/data/upstart/Makefile.am
--- indicator-bluetooth-0.0.6+14.04.20140207/data/upstart/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ indicator-bluetooth-0.0.6+14.10.20141006/data/upstart/Makefile.am	2014-10-06 17:22:11.000000000 +0000
@@ -0,0 +1,17 @@
+BUILT_SOURCES =
+EXTRA_DIST =
+CLEANFILES =
+
+# the upstart version of the xdg autostart job file
+# see https://code.launchpad.net/~charlesk/indicator-bluetooth/upstart-job/+merge/198100
+upstart_xdg_autostartdir = $(datadir)/upstart/xdg/autostart
+upstart_xdg_autostart_DATA = indicator-bluetooth.desktop
+upstart_xdg_autostart_in = indicator-bluetooth.desktop.in
+$(upstart_xdg_autostart_DATA): $(upstart_xdg_autostart_in)
+	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+BUILT_SOURCES += $(upstart_xdg_autostart_DATA)
+EXTRA_DIST += $(upstart_xdg_autostart_in)
+CLEANFILES += $(upstart_xdg_autostart_DATA)
+
+EXTRA_DIST += \
+  indicator-bluetooth.upstart.desktop.in
diff -Nru indicator-bluetooth-0.0.6+14.04.20140207/debian/changelog indicator-bluetooth-0.0.6+14.10.20141006/debian/changelog
--- indicator-bluetooth-0.0.6+14.04.20140207/debian/changelog	2014-10-08 06:34:20.000000000 +0000
+++ indicator-bluetooth-0.0.6+14.10.20141006/debian/changelog	2014-10-08 06:34:21.000000000 +0000
@@ -1,3 +1,17 @@
+indicator-bluetooth (0.0.6+14.10.20141006-0ubuntu1) utopic; urgency=low
+
+  [ Charles Kerr ]
+  * Move the position of this indicator on the panel. (LP: #1377294)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Mon, 06 Oct 2014 17:22:41 +0000
+
+indicator-bluetooth (0.0.6+14.10.20140922-0ubuntu1) utopic; urgency=medium
+
+  [ Ted Gould ]
+  * Synchronize process management across indicators
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Mon, 22 Sep 2014 14:03:08 +0000
+
 indicator-bluetooth (0.0.6+14.04.20140207-0ubuntu2) trusty; urgency=medium
 
   * Toggle rfkill again so that we have a chance of persisting the bluetooth