diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 0a01c31e17e..1b69dc3b4ae 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2008/02/02 09:51:04 steven Exp $
+# $OpenBSD: Makefile,v 1.17 2008/02/09 15:07:19 ajacoutot Exp $
 
 COMMENT=	free audio editor
 
 V=		1.3.4
 DISTNAME=	audacity-src-${V}
-PKGNAME=	audacity-${V}p1
+PKGNAME=	audacity-${V}p2
 CATEGORIES=	audio
 
 EXTRACT_SUFX=	.tar.bz2
@@ -77,6 +77,9 @@ NO_REGRESS=	Yes
 pre-configure:
 	@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
 		${WRKSRC}/src/export/ExportMP3.cpp
+	@perl -pi -e 's,!!CXXFLAGS!!,${CXXFLAGS},g' \
+		${WRKSRC}/lib-src/libvamp/Makefile.in \
+		${WRKSRC}/lib-src/allegro/Makefile.in
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
diff --git a/audio/audacity/patches/patch-lib-src_allegro_Makefile_in b/audio/audacity/patches/patch-lib-src_allegro_Makefile_in
index 9e929cefa16..b67b36678c9 100644
--- a/audio/audacity/patches/patch-lib-src_allegro_Makefile_in
+++ b/audio/audacity/patches/patch-lib-src_allegro_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-lib-src_allegro_Makefile_in,v 1.2 2006/10/12 14:26:03 alek Exp $
---- lib-src/allegro/Makefile.in.orig	Sun Nov 27 17:47:28 2005
-+++ lib-src/allegro/Makefile.in	Sat Oct  7 17:04:38 2006
+$OpenBSD: patch-lib-src_allegro_Makefile_in,v 1.3 2008/02/09 15:07:19 ajacoutot Exp $
+--- lib-src/allegro/Makefile.in.orig	Tue Nov 13 23:01:48 2007
++++ lib-src/allegro/Makefile.in	Sat Feb  9 14:42:49 2008
 @@ -4,7 +4,7 @@ CC = @CC@
  CCC = @CXX@
  srcdir=@srcdir@
  
 -CFLAGS = -g -O
-+CFLAGS = @CFLAGS@
++CFLAGS = !!CXXFLAGS!!
  CPPOBJ = \
  	allegro.cpp.o \
  	allegrord.cpp.o \
diff --git a/audio/audacity/patches/patch-lib-src_libvamp_Makefile_in b/audio/audacity/patches/patch-lib-src_libvamp_Makefile_in
new file mode 100644
index 00000000000..3438e91799f
--- /dev/null
+++ b/audio/audacity/patches/patch-lib-src_libvamp_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-lib-src_libvamp_Makefile_in,v 1.1 2008/02/09 15:07:19 ajacoutot Exp $
+--- lib-src/libvamp/Makefile.in.orig	Sat Feb  9 14:10:23 2008
++++ lib-src/libvamp/Makefile.in	Sat Feb  9 14:13:06 2008
+@@ -30,7 +30,7 @@ default:	sdkstatic
+ 
+ # Compile flags
+ #
+-CXXFLAGS	:= $(CXXFLAGS) -O2 -Wall -I.
++CXXFLAGS	= !!CXXFLAGS!! -Wall -I.
+ 
+ # Libraries required for the plugins.
+ # (Note that it is desirable to statically link libstdc++ if possible,
diff --git a/audio/audacity/pkg/PLIST b/audio/audacity/pkg/PLIST
index 88f0823fe1b..7d89862572a 100644
--- a/audio/audacity/pkg/PLIST
+++ b/audio/audacity/pkg/PLIST
@@ -1,7 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.7 2007/12/16 11:30:20 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.8 2008/02/09 15:07:19 ajacoutot Exp $
 bin/audacity
 @man man/man1/audacity.1
-share/applications/
 share/applications/audacity.desktop
 share/audacity/
 share/audacity/audacity.xpm
@@ -50,15 +49,11 @@ share/locale/bn/LC_MESSAGES/
 share/locale/bn/LC_MESSAGES/audacity.mo
 share/locale/ca/LC_MESSAGES/audacity.mo
 share/locale/cs/LC_MESSAGES/audacity.mo
-share/locale/cy/
-share/locale/cy/LC_MESSAGES/
 share/locale/cy/LC_MESSAGES/audacity.mo
 share/locale/da/LC_MESSAGES/audacity.mo
 share/locale/de/LC_MESSAGES/audacity.mo
 share/locale/el/LC_MESSAGES/audacity.mo
 share/locale/es/LC_MESSAGES/audacity.mo
-share/locale/eu/
-share/locale/eu/LC_MESSAGES/
 share/locale/eu/LC_MESSAGES/audacity.mo
 share/locale/fi/LC_MESSAGES/audacity.mo
 share/locale/fr/LC_MESSAGES/audacity.mo
@@ -68,8 +63,6 @@ share/locale/hu/LC_MESSAGES/audacity.mo
 share/locale/it/LC_MESSAGES/audacity.mo
 share/locale/ja/LC_MESSAGES/audacity.mo
 share/locale/ko/LC_MESSAGES/audacity.mo
-share/locale/lt/
-share/locale/lt/LC_MESSAGES/
 share/locale/lt/LC_MESSAGES/audacity.mo
 share/locale/mk/
 share/locale/mk/LC_MESSAGES/
@@ -92,8 +85,6 @@ share/locale/zh/
 share/locale/zh/LC_MESSAGES/
 share/locale/zh/LC_MESSAGES/audacity.mo
 share/locale/zh_TW/LC_MESSAGES/audacity.mo
-share/mime/
-share/mime/packages/
 share/mime/packages/audacity.xml
 share/pixmaps/
 share/pixmaps/audacity.xpm