diff --git a/lib/libGL/libmesa/Makefile b/lib/libGL/libmesa/Makefile
index ef73b9787..5dcca50e8 100644
--- a/lib/libGL/libmesa/Makefile
+++ b/lib/libGL/libmesa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2011/10/23 13:57:36 matthieu Exp $
+# $OpenBSD: Makefile,v 1.12 2011/11/29 14:57:54 naddy Exp $
 
 MESA=	${.CURDIR}/../../../dist/Mesa/src/mesa
 MAPI=	${.CURDIR}/../../../dist/Mesa/src/mapi
@@ -351,6 +351,15 @@ cleandir:	clean
 	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
 
+.if ${MACHINE_ARCH} == alpha
+# remove optimization flags to prevent gcc 4.2.1 ICE
+prog_execute.so: prog_execute.c
+	@echo "${COMPILE.c:N-O*} ${PICFLAG} -DPIC ${.ALLSRC} -o ${.TARGET}"
+	@${COMPILE.c:N-O*} ${PICFLAG} -DPIC ${.ALLSRC} -o ${.TARGET}.o
+	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
+	@rm -f ${.TARGET}.o
+.endif
+
 .cpp.so:
 	@echo "${COMPILE.cc} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}"
 	@${COMPILE.cc} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}.o