diff --git a/Makefile b/Makefile
index d6e07f47d..ad00d3e80 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2010/01/31 14:28:45 matthieu Exp $
+# $OpenBSD: Makefile,v 1.36 2010/05/11 18:51:21 espie Exp $
 .include <bsd.own.mk>
 
 LOCALAPPD=/usr/local/lib/X11/app-defaults
@@ -11,7 +11,7 @@ RM?=rm
 XSERVER= xserver
 .endif
 
-.if ${USE_GCC3:L} == "yes"
+.if ${COMPILER_VERSION:L:Mgcc[34]*}
 XSERVER+= kdrive
 .endif
 
diff --git a/lib/pixman/Makefile.bsd-wrapper b/lib/pixman/Makefile.bsd-wrapper
index 8f45708dc..d5a2b0a6f 100644
--- a/lib/pixman/Makefile.bsd-wrapper
+++ b/lib/pixman/Makefile.bsd-wrapper
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.9 2010/03/25 21:58:52 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.10 2010/05/11 18:51:21 espie Exp $
+
+.include <bsd.own.mk>
 
 SHARED_LIBS=	pixman-1 16.6
 
-.if ${MACHINE} == amd64
+.if ${MACHINE} == amd64 && !${COMPILER_VERSION:L:Mgcc4*}
 CONFIGURE_ARGS += --disable-sse2
 .endif