diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile
index f869a3e5ee2..df22da50207 100644
--- a/audio/taglib/Makefile
+++ b/audio/taglib/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2009/04/22 08:58:34 landry Exp $
+# $OpenBSD: Makefile,v 1.11 2009/05/03 15:13:53 martynas Exp $
 
 COMMENT=	managing meta-data of audio formats
 DISTNAME=	taglib-1.5
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	audio devel
 MASTER_SITES=	http://ktown.kde.org/~wheeler/files/src/
 SHARED_LIBS +=	tag                  7.0      # .6.0
diff --git a/audio/taglib/patches/patch-taglib_toolkit_tmap_h b/audio/taglib/patches/patch-taglib_toolkit_tmap_h
new file mode 100644
index 00000000000..9537680a439
--- /dev/null
+++ b/audio/taglib/patches/patch-taglib_toolkit_tmap_h
@@ -0,0 +1,14 @@
+$OpenBSD: patch-taglib_toolkit_tmap_h,v 1.1 2009/05/03 15:13:53 martynas Exp $
+--- taglib/toolkit/tmap.h.orig	Mon Feb  4 17:14:45 2008
++++ taglib/toolkit/tmap.h	Fri May  1 15:23:52 2009
+@@ -27,7 +27,10 @@
+ #define TAGLIB_MAP_H
+ 
+ #include <map>
++
++#ifdef WANT_CLASS_INSTANTIATION_OF_MAP
+ using namespace std;
++#endif
+ 
+ #include "taglib.h"
+