--- dbus-1.0.2/dbus-glib-0.72/tools/Makefile.in	2006-10-25 17:14:33.000000000 -0400
+++ dbus-1.0.2-new/dbus-glib-0.72/tools/Makefile.in	2007-01-09 17:15:08.000000000 -0500
@@ -492,7 +492,7 @@
 	$(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
 
 dbus-bus-introspect.xml:
-	DBUS_TOP_BUILDDIR=$(top_builddir) dbus-daemon --introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
+	DBUS_TOP_BUILDDIR=$(top_builddir) ../../bus/dbus-daemon --introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- dbus-1.0.2/start-session-bus.sh	1969-12-31 19:00:00.000000000 -0500
+++ dbus-1.0.2-new/start-session-bus.sh	2007-01-09 17:15:22.000000000 -0500
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+
+
+DO_SH=0
+DO_CSH=0
+
+for arg in "$@"; do
+	case "$arg" in
+		--sh-syntax) DO_SH=1 ;;
+		--csh-syntax) DO_CSH=1 ;;
+	esac
+done
+
+unset DBUS_SESSION_BUS_PID
+SESSION_FILE="/tmp/fink-dbus-session-`id -u`"
+
+if [ -f "${SESSION_FILE}" ]; then
+	. "${SESSION_FILE}"
+	if [ `/bin/ps -p "${DBUS_SESSION_BUS_PID}" | grep -c "^ *${DBUS_SESSION_BUS_PID} "` -eq 0 ]; then
+		@FINKPREFIX@/bin/dbus-launch --sh-syntax >"${SESSION_FILE}"
+	fi
+else
+	@FINKPREFIX@/bin/dbus-launch --sh-syntax >"${SESSION_FILE}"
+fi
+
+. "${SESSION_FILE}"
+
+if [ "$DO_SH" -eq 1 ]; then
+	echo "DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}';"
+	echo "export DBUS_SESSION_BUS_ADDRESS;"
+	echo "DBUS_SESSION_BUS_PID=${DBUS_SESSION_BUS_PID};"
+fi
+if [ "$DO_CSH" -eq 1 ]; then
+	echo "setenv DBUS_SESSION_BUS_ADDRESS '${DBUS_SESSION_BUS_ADDRESS}';"
+	echo "set DBUS_SESSION_BUS_PID=${DBUS_SESSION_BUS_PID};"
+fi
+
+exit 0
--- dbus-1.0.2/start-system-bus.sh	1969-12-31 19:00:00.000000000 -0500
+++ dbus-1.0.2-new/start-system-bus.sh	2007-01-09 17:15:31.000000000 -0500
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+
+
+if [ -f "@FINKPREFIX@/var/run/dbus/pid" ]; then
+	PID=`cat "@FINKPREFIX@/var/run/dbus/pid"`
+	if [ `/bin/ps -p "${PID}" | grep -c "^ *${PID} "` -eq 0 ]; then
+		rm -f "@FINKPREFIX@/var/run/dbus/pid"
+		exec "@FINKPREFIX@/bin/dbus-daemon" --system
+	fi
+else
+	exec "@FINKPREFIX@/bin/dbus-daemon" --system
+fi
+
+exit 0