diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 27b43b8825c..40809da55e1 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.56 2011/09/16 09:48:08 espie Exp $
+# $OpenBSD: Makefile,v 1.57 2011/11/07 15:39:50 espie Exp $
 
 COMMENT-main=		GNU editor: extensible, customizable, self documenting
 COMMENT-el=		elisp sources for those who want to read/modify them
@@ -38,6 +38,8 @@ FLAVOR?=
 
 GCCARCH=		${MACHINE_ARCH}-unknown-openbsd${OSREV}
 
+MODGNU_EMACS_YOURE_WEIRD = Oh yes
+
 CONFIGURE_STYLE=	gnu dest
 CONFIGURE_ARGS=		${GCCARCH} --with-pop
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include \
@@ -51,7 +53,7 @@ SUBST_VARS=		GCCARCH VERSION
 
 WANTLIB-main=		c m ncurses ossaudio
 
-.if ${FLAVOR:L:Mno_x11}
+.if ${FLAVOR:Mno_x11}
 CONFIGURE_ARGS+=	--with-x=no
 .else
 LIB_DEPENDS-main=	graphics/libungif \
diff --git a/infrastructure/mk/gnu.port.mk b/infrastructure/mk/gnu.port.mk
index 8f0b6e157c8..e69a513d9a4 100644
--- a/infrastructure/mk/gnu.port.mk
+++ b/infrastructure/mk/gnu.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-# $OpenBSD: gnu.port.mk,v 1.44 2011/11/07 14:23:09 espie Exp $
+# $OpenBSD: gnu.port.mk,v 1.45 2011/11/07 15:39:50 espie Exp $
 #	Based on bsd.port.mk, originally by Jordan K. Hubbard.
 #	This file is in the public domain.
 
@@ -38,7 +38,9 @@ CONFIG_SITE = ${PORTSDIR}/infrastructure/db/config.site
 .endif
 .if !empty(CONFIG_SITE)
 CONFIGURE_ENV += CONFIG_SITE='${CONFIG_SITE}'
-#MAKE_ENV += CONFIG_SITE='${CONFIG_SITE}'
+.  if !defined(MODGNU_EMACS_YOURE_WEIRD)
+MAKE_ENV += CONFIG_SITE='${CONFIG_SITE}'
+.  endif
 .endif
 
 MODGNU_CONFIG_GUESS_DIRS ?=${WRKSRC}