diff --git a/audio/scmpc/Makefile b/audio/scmpc/Makefile
index da34200f6f1..78423620f2f 100644
--- a/audio/scmpc/Makefile
+++ b/audio/scmpc/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2007/09/23 22:06:46 merdely Exp $
+# $OpenBSD: Makefile,v 1.8 2008/01/01 21:22:27 jasper Exp $
 
 COMMENT=		client for MPD to submit tracks to Last.fm
 CATEGORIES=		audio
 DISTNAME=		scmpc-0.2.2
-PKGNAME=		${DISTNAME}p4
+PKGNAME=		${DISTNAME}p5
 
 HOMEPAGE=		http://scmpc.berlios.de/
 
@@ -24,9 +24,9 @@ MODGCC3_LANGS=		c
 MODULES+=		devel/gettext
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+= 	LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ENV+= 	CPPFLAGS="-I${LOCALBASE}/include"
-CONFIGURE_ENV+= 	CFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV+= 	LDFLAGS="-L${LOCALBASE}/lib" \
+			CPPFLAGS="-I${LOCALBASE}/include" \
+			CFLAGS="-I${LOCALBASE}/include"
 
 LIB_DEPENDS=		argtable2.>=1::devel/argtable \
 			confuse.>=0::devel/libconfuse \
diff --git a/audio/scmpc/patches/patch-src-preferences_c b/audio/scmpc/patches/patch-src-preferences_c
index 8afb24eb186..862882bd05e 100644
--- a/audio/scmpc/patches/patch-src-preferences_c
+++ b/audio/scmpc/patches/patch-src-preferences_c
@@ -1,7 +1,11 @@
---- src/preferences.c.orig	Fri Dec  8 16:40:02 2006
-+++ src/preferences.c	Fri Dec  8 16:40:10 2006
-@@ -42,7 +42,7 @@
- #define DEFAULT_CONFIG_FILE SYSCONFDIR "/scmpc.conf"
+--- src/preferences.c.orig	Sat Dec  2 21:59:17 2006
++++ src/preferences.c	Tue Jan  1 21:49:51 2008
+@@ -39,10 +39,10 @@
+ #include "scmpc.h"
+ #include "preferences.h"
+ 
+-#define DEFAULT_CONFIG_FILE SYSCONFDIR "/scmpc.conf"
++#define DEFAULT_CONFIG_FILE SYSCONFDIR "/scmpc/scmpc.conf"
  #define DEFAULT_PID_FILE "/var/run/scmpc.pid"
  #define DEFAULT_LOG_FILE "/var/log/scmpc.log"
 -#define DEFAULT_CACHE_FILE "/var/lib/scmpc/scmpc.cache"