diff --git a/00-start-message-bus.sh b/00-start-message-bus.sh
new file mode 100755
index 0000000..582b424
--- /dev/null
+++ b/00-start-message-bus.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+# Copyright (C) 2008 Red Hat, Inc.
+#
+# All rights reserved. This copyrighted material is made available to anyone
+# wishing to use, modify, copy, or redistribute it subject to the terms and
+# conditions of the GNU General Public License version 2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+        eval `dbus-launch --sh-syntax --exit-with-session`
+fi
diff --git a/dbus.spec b/dbus.spec
index 283b8c1..3fd9f24 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -8,10 +8,11 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.1.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
+Source2: 00-start-message-bus.sh
 License: GPLv2+ or AFL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -139,6 +140,8 @@ cp doc/dbus-faq.html %{buildroot}%{_datadir}/devhelp/books/dbus
 cp doc/dbus-tutorial.html %{buildroot}%{_datadir}/devhelp/books/dbus
 cp doc/api/html/* %{buildroot}%{_datadir}/devhelp/books/dbus/api
 
+install -D -m755 %{SOURCE2} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh
+
 ## %find_lang %{gettext_package}
 
 %clean
@@ -203,6 +206,7 @@ fi
 
 %{_bindir}/dbus-launch
 %{_datadir}/man/man*/dbus-launch.1.gz
+%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh
 
 %files doc
 %defattr(-,root,root)
@@ -219,6 +223,10 @@ fi
 %{_includedir}/*
 
 %changelog
+* Mon Feb  4 2008 Ray Strode <rstrode@redhat.com> - 1.1.4-3
+- Start message bus from xinitrc.d instead of hard coding it
+at the end of Xsession
+
 * Mon Feb  4 2008 Matthias Clasen <mclasen@redhat.com> - 1.1.4-2
 - Make it build against the latest gcc/glibc