diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 6ae0b3d49df..da1ab8e7a22 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2004/12/14 21:15:55 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2005/01/02 04:43:06 pvalchev Exp $
 
 .if ${MACHINE_ARCH} == "hppa"
 BROKEN=			"hangs indefinitely until machine panics/hangs"
@@ -43,6 +43,11 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include \
 			LDFLAGS="${ELF_TOOLCHAIN:L:S/yes/-Z/:S/no//} \
 				 -L${LOCALBASE}/lib"
 
+# Disable propolice on powerpc due to gcc3+propolice bug.
+.if ${MACHINE_ARCH} == "powerpc"
+CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -fno-stack-protector"
+.endif
+
 MAKE_ENV=		INSTALL_EMACS="${INSTALL_SCRIPT}"
 
 SUBST_VARS=		GCCARCH VERSION