diff --git a/audio/xmms-bonk/Makefile b/audio/xmms-bonk/Makefile
index 2de5bbb1698..56129ca707e 100644
--- a/audio/xmms-bonk/Makefile
+++ b/audio/xmms-bonk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2002/06/03 14:51:26 naddy Exp $
+# $OpenBSD: Makefile,v 1.2 2002/06/15 14:52:58 naddy Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
@@ -22,6 +22,7 @@ MASTER_SITES=	http://www.proustmedia.de/bonk-xmms/
 
 LIB_DEPENDS=	xmms.3::audio/xmms
 
+MAKE_ENV=	CXX="${CXX}"
 ALL_TARGET=
 
 do-install:
diff --git a/audio/xmms-bonk/patches/patch-bonk-xmms_cc b/audio/xmms-bonk/patches/patch-bonk-xmms_cc
new file mode 100644
index 00000000000..44044209b26
--- /dev/null
+++ b/audio/xmms-bonk/patches/patch-bonk-xmms_cc
@@ -0,0 +1,21 @@
+$OpenBSD: patch-bonk-xmms_cc,v 1.1 2002/06/15 14:52:58 naddy Exp $
+--- bonk-xmms.cc.orig	Fri May 31 20:22:09 2002
++++ bonk-xmms.cc	Sat Jun 15 14:38:45 2002
+@@ -44,6 +44,8 @@
+ #include <string>
+ #include <algorithm>
+ 
++using namespace std;
++
+ // == Déclarations plugin ======================================================
+ 
+ #define VERSION "0.11"
+@@ -151,7 +153,7 @@
+     * @param format char* Chaîne de format
+     * @param ...          Liste d'arguments variables
+     */
+-   void bonk_xmms__log(int line, char *func, char *format, ...)
++   void bonk_xmms__log(int line, const char *func, char *format, ...)
+    {
+ #ifdef DEBUG
+       FILE *logfile = fopen("/tmp/plugin-bonk.log", "a");