diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index a8e052f7af2..8841a5370ac 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2006/11/11 21:04:27 steven Exp $
+# $OpenBSD: Makefile,v 1.15 2007/03/28 14:36:17 naddy Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	"XMMS input plugin for playing FLAC files"
 
 VERSION=	1.1.2
-PKGNAME=	xmms-flac-${VERSION}
+PKGNAME=	xmms-flac-${VERSION}p0
 DISTNAME=	flac-${VERSION}
 CATEGORIES=	audio
 HOMEPAGE=	http://flac.sourceforge.net/
@@ -17,10 +17,10 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext Xi gdk glib gmodule gtk iconv intl m
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flac/}
 
+WANTLIB=	X11 Xext Xi gdk glib gmodule gtk iconv intl m
 LIB_DEPENDS=	xmms.>=4::audio/xmms \
 		FLAC.>=7::audio/flac
 
@@ -30,13 +30,10 @@ CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--with-libiconv-prefix="${LOCALBASE}" \
 		--with-ogg="${LOCALBASE}" \
 		--with-xmms-prefix="${LOCALBASE}"
-
+LIBTOOL_FLAGS=	--tag=disable-static
+MAKE_ENV=	MAKEOBJDIR=/nonexistent		# ignore ${WRKSRC}/obj
 MAKE_FILE=	${FILESDIR}/Makefile
 
-# "obj" is magic to our make(1)
-post-configure:
-	@rm -rf ${WRKSRC}/obj
-
 NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/audio/xmms-flac/pkg/PLIST b/audio/xmms-flac/pkg/PLIST
index f99d7c3b819..8024ba7c08b 100644
--- a/audio/xmms-flac/pkg/PLIST
+++ b/audio/xmms-flac/pkg/PLIST
@@ -1,4 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.3 2005/03/09 00:15:14 naddy Exp $
-@comment lib/xmms/Input/libxmms-flac.a
+@comment $OpenBSD: PLIST,v 1.4 2007/03/28 14:36:17 naddy Exp $
 @comment lib/xmms/Input/libxmms-flac.la
 lib/xmms/Input/libxmms-flac.so