diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index c2558176d6d5..a97638062264 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -1,66 +1,66 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 
 PORTNAME=	dbus
 DISTVERSION=	1.12.20
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Message bus system for inter-application communication
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		cpe gmake libtool localbase pkgconfig python:build shebangfix
 CPE_VENDOR=	d-bus_project
 CPE_PRODUCT=	d-bus
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	dbus
 SHEBANG_FILES=	tools/GetAllMatchRules.py
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-apparmor \
 		--disable-doxygen-docs \
 		--disable-selinux \
 		--disable-systemd \
 		--with-session-socket-dir=/tmp \
 		--with-test-socket-dir=${WRKDIR}
 
 INSTALL_TARGET=	install-strip
 
 PORTSCOUT=	limitw:1,even
 
 USERS=		messagebus
 GROUPS=		messagebus
 
 PLIST_SUB=	GROUPS=${GROUPS} \
 		VERSION="1.0"
 
 OPTIONS_DEFINE=		EXAMPLES MANPAGES X11
 OPTIONS_DEFAULT=	MANPAGES X11
 OPTIONS_SUB=		yes
 X11_DESC=		Support X11 Desktop Environments
 
 MANPAGES_BUILD_DEPENDS=		minixmlto:textproc/minixmlto
 MANPAGES_CONFIGURE_ENABLE=	xml-docs
 MANPAGES_CONFIGURE_ENV=		XMLTO=${LOCALBASE}/bin/minixmlto
 X11_USES=			xorg
 X11_USE=			XORG=ice,sm,x11
 X11_CONFIGURE_WITH=		x
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/dbus/dbus-sysdeps-util-unix.c
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${MV} ${STAGEDIR}${DOCSDIR}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 	${RM} -r ${STAGEDIR}${DOCSDIR}
 .for file in session.conf system.conf
 	@cd ${STAGEDIR}${ETCDIR}-1/ && \
 		${MV} ${file} ${file}.sample
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in
index 7fb087e2bdfc..97635949eba1 100644
--- a/devel/dbus/files/dbus.in
+++ b/devel/dbus/files/dbus.in
@@ -1,36 +1,37 @@
 #!/bin/sh
 
 # PROVIDE: dbus
 # REQUIRE: DAEMON ldconfig
 #
 # Add the following lines to /etc/rc.conf to enable the D-BUS messaging system:
 #
 # dbus_enable="YES"
 #
 
 . /etc/rc.subr
 
 : ${dbus_enable=${gnome_enable-NO}} ${dbus_flags="--system"}
 
 name=dbus
 rcvar=dbus_enable
 
 command="%%PREFIX%%/bin/dbus-daemon"
 pidfile="/var/run/dbus/pid"
 
 start_precmd="dbus_prestart"
 stop_postcmd="dbus_poststop"
 
 dbus_prestart()
 {
+    mkdir -p /var/lib/dbus
     %%PREFIX%%/bin/dbus-uuidgen --ensure
     mkdir -p /var/run/dbus
 }
 
 dbus_poststop()
 {
     rm -f $pidfile
 }
 
 load_rc_config ${name}
 run_rc_command "$1"