diff --git a/audio/libmpcdec/Makefile b/audio/libmpcdec/Makefile
index 4bbb7743554..76cecf30266 100644
--- a/audio/libmpcdec/Makefile
+++ b/audio/libmpcdec/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2006/03/10 09:43:37 espie Exp $
+# $OpenBSD: Makefile,v 1.2 2006/03/10 15:53:52 jolan Exp $
 COMMENT=	"musepack, high quality audio compression format"
 
 DISTNAME=	libmpcdec-1.2.2
-PKGNAME=	${DISTNAME}
+PKGNAME=	${DISTNAME}p0
 
 CATEGORIES=	audio
 
-HOMEPAGE=	http://www.musepack.net
+HOMEPAGE=	http://www.musepack.net/
 
 MAINTAINER=	David Love <david@dcs.shef.ac.uk>
 
@@ -21,13 +21,18 @@ PERMIT_PACKAGE_FTP=     Yes
 
 DOCDIR=${PREFIX}/share/doc/libmpcdec
 
+pre-configure:
+	@perl -pi -e 's|-O3\ -fomit-frame-pointer||g' ${WRKSRC}/configure
+
 post-install:
+	${INSTALL} ${WRKBUILD}/src/.libs/sample ${PREFIX}/bin/mpc2wav
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	cp -r ${WRKDIST}/docs/* ${DOCDIR}
 
 SHARED_LIBS=	mpcdec 1.0
 
 USE_LIBTOOL=	Yes
+WANTLIB=	c m stdc++
 
 CONFIGURE_STYLE=gnu
 
diff --git a/audio/libmpcdec/pkg/PLIST b/audio/libmpcdec/pkg/PLIST
index dacbfcf6ce9..3c3e7531b8b 100644
--- a/audio/libmpcdec/pkg/PLIST
+++ b/audio/libmpcdec/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2006/03/10 09:43:37 espie Exp $
+@comment $OpenBSD: PLIST,v 1.2 2006/03/10 15:53:53 jolan Exp $
 %%SHARED%%
+bin/mpc2wav
 include/mpcdec/
 include/mpcdec/config_types.h
 include/mpcdec/decoder.h