diff --git a/audio/mt-daapd/Makefile b/audio/mt-daapd/Makefile
index 5e5c258f0d7..a944b77ec92 100644
--- a/audio/mt-daapd/Makefile
+++ b/audio/mt-daapd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2007/01/09 10:15:15 millert Exp $
+# $OpenBSD: Makefile,v 1.6 2007/01/10 08:00:03 steven Exp $
 
 COMMENT=	"multi-threaded DAAP server"
 
 DISTNAME=	mt-daapd-0.2.4
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	audio net
 
 HOMEPAGE=	http://www.mt-daapd.org/
@@ -35,6 +35,11 @@ LIB_DEPENDS+=	howl::net/howl
 CONFIGURE_ARGS+=--enable-howl --with-howl-includes=${LOCALBASE}/include/howl
 .endif
 
+pre-configure:
+	@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},;' \
+		-e 's,!!SYSCONFDIR!!,${SYSCONFDIR},' \
+		${WRKSRC}/contrib/mt-daapd.conf
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mt-daapd
 	${INSTALL_DATA} ${WRKSRC}/contrib/mt-daapd.* \
diff --git a/audio/mt-daapd/patches/patch-contrib_mt-daapd_conf b/audio/mt-daapd/patches/patch-contrib_mt-daapd_conf
new file mode 100644
index 00000000000..37ccae04951
--- /dev/null
+++ b/audio/mt-daapd/patches/patch-contrib_mt-daapd_conf
@@ -0,0 +1,21 @@
+$OpenBSD: patch-contrib_mt-daapd_conf,v 1.1 2007/01/10 08:00:03 steven Exp $
+--- contrib/mt-daapd.conf.orig	Wed Jan 10 08:52:43 2007
++++ contrib/mt-daapd.conf	Wed Jan 10 08:53:54 2007
+@@ -23,7 +23,7 @@
+ # path is probably /usr/local/share/mt-daapd/admin-root.
+ #
+ 
+-web_root	/usr/share/mt-daapd/admin-root
++web_root	!!LOCALBASE!!/share/mt-daapd/admin-root
+ 
+ #
+ # port (required)
+@@ -98,7 +98,7 @@ runas	nobody
+ # below.
+ #
+ 
+-playlist	/etc/mt-daapd.playlist
++playlist	!!SYSCONFDIR!!/mt-daapd.playlist
+ 
+ #
+ # password (optional)