diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index ec287c2bdf43..9b816b0351f6 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dbus
 PORTVERSION=	0.61
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES?=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/
 
diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in
index 02d9c577595d..61638229f36b 100644
--- a/devel/dbus/files/dbus.in
+++ b/devel/dbus/files/dbus.in
@@ -21,9 +21,15 @@ rcvar=`set_rcvar`
 command="%%PREFIX%%/bin/dbus-daemon"
 pidfile="/var/run/dbus/${name}.pid"
 
-stop_postcmd=stop_postcmd
+start_precmd="dbus_prestart"
+stop_postcmd="dbus_poststop"
 
-stop_postcmd()
+dbus_prestart()
+{
+    mkdir -p $(dirname $pidfile)
+}
+
+dbus_poststop()
 {
     rm -f $pidfile
 }