diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 2ae973a7e374..4ebc76799591 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/02/07 19:32:03 rmind Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/07 22:12:21 rillig Exp $
 
 DISTNAME=	geany-0.10
 CATEGORIES=	devel
@@ -12,5 +12,8 @@ GNU_CONFIGURE=	YES
 USE_TOOLS+=		pkg-config
 USE_LANGUAGES=	c c++
 
+BUILDLINK_TRANSFORM+=	rm:-lstdc++
+MAKE_FLAGS+=		CCLD=${CXX:Q}
+
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"