diff --git a/x11/dbus/Makefile b/x11/dbus/Makefile
index 10a76489f7a..3fe691dc068 100644
--- a/x11/dbus/Makefile
+++ b/x11/dbus/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2006/12/16 12:22:35 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2007/03/21 00:21:58 espie Exp $
 
 COMMENT=		"message system"
 
-DISTNAME=		dbus-0.94
-SHARED_LIBS +=  dbus-1               5.0      # .5.0
+DISTNAME=		dbus-1.0.2
+SHARED_LIBS +=  dbus-1               6.0      # .5.0
 CATEGORIES=		x11
 
 HOMEPAGE=		http://dbus.freedesktop.org/
@@ -21,6 +21,7 @@ LIB_DEPENDS=		expat.>=6::textproc/expat
 
 SEPARATE_BUILD=		simple
 
+AUTOCONF_VERSION=	2.59
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV=		LDFLAGS=-L${LOCALBASE}/lib \
 			CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread"
diff --git a/x11/dbus/distinfo b/x11/dbus/distinfo
index 5b363c444dc..93275b6d38a 100644
--- a/x11/dbus/distinfo
+++ b/x11/dbus/distinfo
@@ -1,4 +1,4 @@
-MD5 (dbus-0.94.tar.gz) = 85653cafbcfc7edfbad9639459758ed3
-RMD160 (dbus-0.94.tar.gz) = 7e79dfe0d04016b802b72968c2c46d7766f806ed
-SHA1 (dbus-0.94.tar.gz) = 8be9629cb950d33da76243d4b7af4ec3d77c152e
-SIZE (dbus-0.94.tar.gz) = 1372266
+MD5 (dbus-1.0.2.tar.gz) = 0552a9b54beb4a044951b7cdbc8fc855
+RMD160 (dbus-1.0.2.tar.gz) = d5eddfb058c4c026d4a9f091ad90abcc6e54861a
+SHA1 (dbus-1.0.2.tar.gz) = 2870efd6ea0b5b0d14e52195f560238a74bb1e0e
+SIZE (dbus-1.0.2.tar.gz) = 1400278
diff --git a/x11/dbus/patches/patch-bus_bus_c b/x11/dbus/patches/patch-bus_bus_c
deleted file mode 100644
index 7d4b72e4522..00000000000
--- a/x11/dbus/patches/patch-bus_bus_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-bus_bus_c,v 1.1 2006/11/07 10:40:19 alek Exp $
---- bus/bus.c.orig	Mon Nov  6 01:22:54 2006
-+++ bus/bus.c	Mon Nov  6 01:23:26 2006
-@@ -517,7 +517,8 @@ process_config_postinit (BusContext     
-   /* Watch all conf directories */
-   _dbus_list_foreach (bus_config_parser_get_conf_dirs (parser),
- 		      (DBusForeachFunction) bus_watch_directory,
--		      NULL);
-+		      bus_context_get_loop (context));
-+
- 
-   return TRUE;
- }
diff --git a/x11/dbus/patches/patch-dbus-1_pc_in b/x11/dbus/patches/patch-dbus-1_pc_in
index 201dbe718d1..25e1576c04b 100644
--- a/x11/dbus/patches/patch-dbus-1_pc_in
+++ b/x11/dbus/patches/patch-dbus-1_pc_in
@@ -1,11 +1,11 @@
-$OpenBSD: patch-dbus-1_pc_in,v 1.1 2006/11/07 10:40:19 alek Exp $
---- dbus-1.pc.in.orig	Mon Nov  6 02:57:09 2006
-+++ dbus-1.pc.in	Mon Nov  6 02:58:50 2006
+$OpenBSD: patch-dbus-1_pc_in,v 1.2 2007/03/21 00:21:58 espie Exp $
+--- dbus-1.pc.in.orig	Thu Oct 26 20:06:07 2006
++++ dbus-1.pc.in	Fri Dec 29 15:45:18 2006
 @@ -9,6 +9,6 @@ session_bus_services_dir=@EXPANDED_DATAD
  Name: dbus
  Description: Free desktop message bus
  Version: @VERSION@
--Libs: -L${libdir} -ldbus-1
-+Libs: -L${libdir} -ldbus-1 -pthread
+-Libs: -L${libdir} -ldbus-1 @DBUS_CLIENT_LIBS@ 
++Libs: -L${libdir} -ldbus-1 -pthread @DBUS_CLIENT_LIBS@ 
  Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include
  
diff --git a/x11/dbus/patches/patch-dbus_Makefile_in b/x11/dbus/patches/patch-dbus_Makefile_in
new file mode 100644
index 00000000000..1340ea00302
--- /dev/null
+++ b/x11/dbus/patches/patch-dbus_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-dbus_Makefile_in,v 1.1 2007/03/21 00:21:58 espie Exp $
+--- dbus/Makefile.in.orig	Tue Dec 12 20:41:47 2006
++++ dbus/Makefile.in	Fri Dec 29 18:45:43 2006
+@@ -299,7 +299,7 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ configdir = $(sysconfdir)/dbus-1
+-INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
++INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(configdir)/machine-id"\"
+ dbusincludedir = $(includedir)/dbus-1.0/dbus
+ dbusarchincludedir = $(libdir)/dbus-1.0/include/dbus
+ lib_LTLIBRARIES = libdbus-1.la
diff --git a/x11/dbus/patches/patch-tools_Makefile_in b/x11/dbus/patches/patch-tools_Makefile_in
new file mode 100644
index 00000000000..059385fc78c
--- /dev/null
+++ b/x11/dbus/patches/patch-tools_Makefile_in
@@ -0,0 +1,23 @@
+$OpenBSD: patch-tools_Makefile_in,v 1.1 2007/03/21 00:21:58 espie Exp $
+--- tools/Makefile.in.orig	Tue Dec 12 20:41:48 2006
++++ tools/Makefile.in	Fri Dec 29 18:46:33 2006
+@@ -289,7 +289,7 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ configdir = $(sysconfdir)/dbus-1
+-INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
++INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(configdir)/machine-id"\"
+ dbus_send_SOURCES = \
+ 	dbus-print-message.c			\
+ 	dbus-print-message.h			\
+@@ -325,8 +325,8 @@ CLEANFILES = \
+ 	run-with-tmp-session-bus.conf
+ 
+ 
+-#create the /var/lib/data directory for dbus-uuidgen
+-localstatelibdir = $(localstatedir)/lib/dbus
++#create the /var/run/data directory for dbus-uuidgen
++localstatelibdir = $(configdir)
+ localstatelib_DATA = 
+ all: all-am
+ 
diff --git a/x11/dbus/patches/patch-tools_dbus-uuidgen_1 b/x11/dbus/patches/patch-tools_dbus-uuidgen_1
new file mode 100644
index 00000000000..e9414ee4b57
--- /dev/null
+++ b/x11/dbus/patches/patch-tools_dbus-uuidgen_1
@@ -0,0 +1,32 @@
+$OpenBSD: patch-tools_dbus-uuidgen_1,v 1.1 2007/03/21 00:21:58 espie Exp $
+--- tools/dbus-uuidgen.1.orig	Mon Dec 11 20:21:26 2006
++++ tools/dbus-uuidgen.1	Fri Dec 29 18:47:17 2006
+@@ -30,7 +30,7 @@ script of a D-Bus package like this:
+ .fi
+ 
+ .PP
+-This will ensure that /var/lib/dbus/machine-id exists and has the uuid in it.
++This will ensure that /var/run/dbus/machine-id exists and has the uuid in it.
+ It won't overwrite an existing uuid, since this id should remain fixed
+ for a single machine until the next reboot at least.
+ 
+@@ -64,15 +64,15 @@ because there are two different kernels.
+ The following options are supported:
+ .TP
+ .I "--get[=FILENAME]"
+-If a filename is not given, defaults to localstatedir/lib/dbus/machine-id
+-(localstatedir is usually /var). If this file exists and is valid, the
++If a filename is not given, defaults to /etc/dbus-1/machine-id.
++If this file exists and is valid, the
+ uuid in the file is printed on stdout. Otherwise, the command exits 
+ with a nonzero status.
+ 
+ .TP
+ .I "--ensure[=FILENAME]"
+-If a filename is not given, defaults to localstatedir/lib/dbus/machine-id
+-(localstatedir is usually /var). If this file exists then it will be
++If a filename is not given, defaults to /etc/dbus-1/machine-id.
++If this file exists then it will be
+ validated, and a failure code returned if it contains the wrong thing.
+ If the file does not exist, it will be created with a new uuid in it.
+ On success, prints no output.
diff --git a/x11/dbus/pkg/MESSAGE b/x11/dbus/pkg/MESSAGE
index ff646de9831..6b18f2e7612 100644
--- a/x11/dbus/pkg/MESSAGE
+++ b/x11/dbus/pkg/MESSAGE
@@ -1,8 +1,3 @@
-To finish installation of dbus package you should run the following
-command as a user root:
-
-# dbus-uuidgen --ensure
-
 To start systemwide message dbus daemon whenever the machine boots,
 add the following lines to /etc/rc.local:
 
diff --git a/x11/dbus/pkg/PLIST b/x11/dbus/pkg/PLIST
index 5029bb2967c..20da4f302c4 100644
--- a/x11/dbus/pkg/PLIST
+++ b/x11/dbus/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2006/11/07 10:40:19 alek Exp $
+@comment $OpenBSD: PLIST,v 1.3 2007/03/21 00:21:58 espie Exp $
 @newgroup _dbus:572
 @newuser _dbus:572:_dbus:daemon:dbus user:/nonexistent:/sbin/nologin
 %%SHARED%%
@@ -17,6 +17,7 @@ include/dbus-1.0/dbus/dbus-errors.h
 include/dbus-1.0/dbus/dbus-macros.h
 include/dbus-1.0/dbus/dbus-memory.h
 include/dbus-1.0/dbus/dbus-message.h
+include/dbus-1.0/dbus/dbus-misc.h
 include/dbus-1.0/dbus/dbus-pending-call.h
 include/dbus-1.0/dbus/dbus-protocol.h
 include/dbus-1.0/dbus/dbus-server.h
@@ -50,9 +51,9 @@ share/examples/dbus/dbus-1/system.conf
 @sample ${SYSCONFDIR}/dbus-1/system.conf
 share/examples/dbus/dbus-1/system.d/
 @sample ${SYSCONFDIR}/dbus-1/system.d/
+@mode 0750
 @owner _dbus
 @group _dbus
-@mode 0750
 @sample /var/run/dbus/
+@exec ${PREFIX}/bin/dbus-uuidgen --ensure
 @unexec rm -f /var/run/dbus/*
-@unexec rm -f ${SYSCONFDIR}/dbus-1/machine-id