diff --git a/www/webkit/Makefile b/www/webkit/Makefile
index db5de3a4d4f..bceac2e6502 100644
--- a/www/webkit/Makefile
+++ b/www/webkit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2010/05/17 20:16:09 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2010/05/23 10:27:46 espie Exp $
 
 COMMENT =	open source web browser engine
 
@@ -28,11 +28,17 @@ USE_GMAKE =	Yes
 USE_LIBTOOL =	Yes
 
 MODULES =	converters/libiconv \
-		textproc/intltool \
-		gcc4
+		textproc/intltool
 
+.include <bsd.own.mk>
+.if ${COMPILER_VERSION:L:Mgcc4*}
+STDCPPLIB = stdc++
+.else
+MODULES += 	gcc4
 MODGCC4_ARCHES =*
 MODGCC4_LANGS =	c c++
+STDCPPLIB = estdc++
+.endif
 
 CONFIGURE_STYLE =	gnu
 
@@ -41,6 +47,7 @@ CONFIGURE_ENV =	CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -
 		ac_cv_path_FLEX=${LOCALBASE}/bin/gflex
 
 MAKE_FILE =	GNUmakefile
+MAKE_FLAGS =	STDCPPLIB=${STDCPPLIB}
 
 RUN_DEPENDS =	::multimedia/gstreamer-0.10/plugins-ffmpeg \
 		::multimedia/gstreamer-0.10/plugins-good
diff --git a/www/webkit/patches/patch-GNUmakefile_in b/www/webkit/patches/patch-GNUmakefile_in
index ea1497b2c33..2a91a02c28b 100644
--- a/www/webkit/patches/patch-GNUmakefile_in
+++ b/www/webkit/patches/patch-GNUmakefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-GNUmakefile_in,v 1.6 2010/04/22 13:37:00 landry Exp $
+$OpenBSD: patch-GNUmakefile_in,v 1.7 2010/05/23 10:27:46 espie Exp $
 install GtkLauncher, remove silent build lines, fix lpthread/pthread
 --- GNUmakefile.in.orig	Mon Apr  5 14:55:24 2010
 +++ GNUmakefile.in	Wed Apr 21 15:32:34 2010
@@ -82,7 +82,7 @@ install GtkLauncher, remove silent build lines, fix lpthread/pthread
  	 libJavaScriptCore.la \
  	 -lm \
 -	 -lstdc++
-+	 -lestdc++
++	 -l${STDCPPLIB}
  
  Programs_minidom_LDFLAGS = \
  	-no-install \