diff --git a/x11/dbus/Makefile b/x11/dbus/Makefile
new file mode 100644
index 00000000000..aba3ca3336e
--- /dev/null
+++ b/x11/dbus/Makefile
@@ -0,0 +1,27 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2006/09/19 18:10:14 espie Exp $
+
+
+DISTNAME=		dbus-0.92
+COMMENT=		"message system"
+CATEGORIES=		x11
+HOMEPAGE=		http://dbus.freedesktop.org/
+MASTER_SITES=		http://dbus.freedesktop.org/releases/
+
+SEPARATE_BUILD=		simple
+PKGNAME=		${DISTNAME}
+
+SHARED_LIBS=		dbus-1		3.0
+# GPL
+PERMIT_DISTFILES_CDROM?=	Yes
+PERMIT_DISTFILES_FTP?=		Yes
+PERMIT_PACKAGE_CDROM?=		Yes
+PERMIT_PACKAGE_FTP?=		Yes
+
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ENV=		LDFLAGS=-L${LOCALBASE}/lib \
+			CPPFLAGS=-I${LOCALBASE}/include
+USE_LIBTOOL=		Yes
+
+FAKE_FLAGS=		sysconfdir=${TRUEPREFIX}/share/sample/dbus DESTDIR=${WRKINST}
+
+.include <bsd.port.mk>
diff --git a/x11/dbus/distinfo b/x11/dbus/distinfo
new file mode 100644
index 00000000000..9500ff8e39f
--- /dev/null
+++ b/x11/dbus/distinfo
@@ -0,0 +1,4 @@
+MD5 (dbus-0.92.tar.gz) = ea2be58c80a80631ba5b3c92cffd335c
+RMD160 (dbus-0.92.tar.gz) = 23de0396bf5565c02e2e710bebd95ad5de1832a8
+SHA1 (dbus-0.92.tar.gz) = 37edf2fd6c471b086261462b8b8d3dd2656e1bb4
+SIZE (dbus-0.92.tar.gz) = 1388345
diff --git a/x11/dbus/patches/patch-test_Makefile_am b/x11/dbus/patches/patch-test_Makefile_am
new file mode 100644
index 00000000000..044c641212b
--- /dev/null
+++ b/x11/dbus/patches/patch-test_Makefile_am
@@ -0,0 +1,12 @@
+$OpenBSD: patch-test_Makefile_am,v 1.1.1.1 2006/09/19 18:10:14 espie Exp $
+--- test/Makefile.am.orig	Mon Aug 21 20:13:46 2006
++++ test/Makefile.am	Mon Aug 21 20:14:08 2006
+@@ -91,7 +91,7 @@ TESTDIRS=					\
+ 	data/equiv-config-files/entities/basic.d
+ 
+ 
+-FIND_TESTS=find -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf" -o -name "*.service"
++FIND_TESTS=find . -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf" -o -name "*.service"
+ 
+ dist-hook:
+ 	for D in $(TESTDIRS); do						\
diff --git a/x11/dbus/patches/patch-test_Makefile_in b/x11/dbus/patches/patch-test_Makefile_in
new file mode 100644
index 00000000000..def018662e2
--- /dev/null
+++ b/x11/dbus/patches/patch-test_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-test_Makefile_in,v 1.1.1.1 2006/09/19 18:10:14 espie Exp $
+--- test/Makefile.in.orig	Mon Aug 21 20:20:12 2006
++++ test/Makefile.in	Mon Aug 21 20:20:22 2006
+@@ -365,7 +365,7 @@ TESTDIRS = \
+ 	data/equiv-config-files/entities	\
+ 	data/equiv-config-files/entities/basic.d
+ 
+-FIND_TESTS = find -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf" -o -name "*.service"
++FIND_TESTS = find . -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf" -o -name "*.service"
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/x11/dbus/pkg/DESCR b/x11/dbus/pkg/DESCR
new file mode 100644
index 00000000000..c41c4beba39
--- /dev/null
+++ b/x11/dbus/pkg/DESCR
@@ -0,0 +1,7 @@
+D-BUS is a simple IPC library based on messages.
+
+It replaces DCOP in kde4.
+
+"libdbus" is intended to be a low-level API, similar to Xlib. 
+Most programmers will use the bindings to GLib, Qt, Python, Mono, 
+Java, or whatever.
diff --git a/x11/dbus/pkg/PFRAG.shared b/x11/dbus/pkg/PFRAG.shared
new file mode 100644
index 00000000000..d78d18019e9
--- /dev/null
+++ b/x11/dbus/pkg/PFRAG.shared
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/09/19 18:10:14 espie Exp $
+@lib lib/libdbus-1.so.${LIBdbus-1_VERSION}
diff --git a/x11/dbus/pkg/PLIST b/x11/dbus/pkg/PLIST
new file mode 100644
index 00000000000..556f3575935
--- /dev/null
+++ b/x11/dbus/pkg/PLIST
@@ -0,0 +1,52 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2006/09/19 18:10:14 espie Exp $
+%%SHARED%%
+bin/dbus-cleanup-sockets
+bin/dbus-daemon
+bin/dbus-launch
+bin/dbus-monitor
+bin/dbus-send
+include/dbus-1.0/
+include/dbus-1.0/dbus/
+include/dbus-1.0/dbus/dbus-address.h
+include/dbus-1.0/dbus/dbus-bus.h
+include/dbus-1.0/dbus/dbus-connection.h
+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-pending-call.h
+include/dbus-1.0/dbus/dbus-protocol.h
+include/dbus-1.0/dbus/dbus-server.h
+include/dbus-1.0/dbus/dbus-shared.h
+include/dbus-1.0/dbus/dbus-signature.h
+include/dbus-1.0/dbus/dbus-threads.h
+include/dbus-1.0/dbus/dbus-types.h
+include/dbus-1.0/dbus/dbus.h
+lib/dbus-1.0/
+lib/dbus-1.0/include/
+lib/dbus-1.0/include/dbus/
+lib/dbus-1.0/include/dbus/dbus-arch-deps.h
+lib/libdbus-1.a
+lib/libdbus-1.la
+lib/pkgconfig/
+lib/pkgconfig/dbus-1.pc
+@man man/man1/dbus-cleanup-sockets.1
+@man man/man1/dbus-daemon.1
+@man man/man1/dbus-launch.1
+@man man/man1/dbus-monitor.1
+@man man/man1/dbus-send.1
+share/dbus-1/
+share/dbus-1/services/
+share/sample/
+share/sample/dbus/
+@sample ${SYSCONFDIR}/dbus-1/
+share/sample/dbus/dbus-1/
+share/sample/dbus/dbus-1/session.conf
+@sample ${SYSCONFDIR}/dbus-1/session.conf
+share/sample/dbus/dbus-1/system.conf
+@sample ${SYSCONFDIR}/dbus-1/system.conf
+share/sample/dbus/dbus-1/system.d/
+@sample ${SYSCONFDIR}/dbus-1/system.d/
+var/
+var/run/
+var/run/dbus/