diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index 2281f74de1e8..d7ed8a821806 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -1,72 +1,73 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
 
 # Sometimes this is .include'd several times...
 .if !defined(__CC_MAKEFILE_INC__)
 __CC_MAKEFILE_INC__= ${MFILE}
 
 GCCDIR=	${.CURDIR}/../../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../../contrib/gcclibs
 
 .include "Makefile.tgt"
 
 # Machine description.
 MD_FILE=	${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md
 GCC_TARGET=	${TARGET_ARCH}-undermydesk-freebsd
 
 CFLAGS+=	-DIN_GCC -DHAVE_CONFIG_H
 CFLAGS+=	-DPREFIX=\"${TOOLS_PREFIX}/usr\"
 #CFLAGS+=	-DWANT_COMPILER_INVARIANTS
+CSTD?=	gnu89
 
 # If building 64-bit longs for the i386, "_LARGE_LONG" should also be defined
 # to get the proper sizes in limits.h
 .if defined(LONG_TYPE_SIZE)
 CFLAGS+=	-DLONG_TYPE_SIZE=${LONG_TYPE_SIZE}
 .endif
 
 .if ${TARGET_ARCH} != ${MACHINE_ARCH}
 CFLAGS+=	-DCROSS_COMPILE
 .endif
 
 .if defined(WANT_FORCE_OPTIMIZATION_DOWNGRADE)
 CFLAGS+= -DFORCE_OPTIMIZATION_DOWNGRADE=${WANT_FORCE_OPTIMIZATION_DOWNGRADE}
 .endif
 
 .if exists(${.OBJDIR}/../cc_tools)
 CFLAGS+=	-I${.OBJDIR}/../cc_tools
 .endif
 CFLAGS+=	-I${.CURDIR}/../cc_tools
 # This must go after the -I for cc_tools to resolve ambiguities for hash.h
 # correctly.
 CFLAGS+=	-I${GCCDIR} -I${GCCDIR}/config
 
 CFLAGS+=	-I${GCCLIB}/include
 CFLAGS+=	-I${GCCLIB}/libcpp/include
 CFLAGS+=	-I${GCCLIB}/libdecnumber
 
 .if exists(${.OBJDIR}/../cc_int)
 LIBBACKEND=	${.OBJDIR}/../cc_int/libbackend.a
 .else
 LIBBACKEND=	${.CURDIR}/../cc_int/libbackend.a
 .endif
 
 .if exists(${.OBJDIR}/../libiberty)
 LIBIBERTY=	${.OBJDIR}/../libiberty/libiberty.a
 .else
 LIBIBERTY=	${.CURDIR}/../libiberty/libiberty.a
 .endif
 
 .if exists(${.OBJDIR}/../libcpp)
 LIBCPP=		${.OBJDIR}/../libcpp/libcpp.a
 .else
 LIBCPP=		${.CURDIR}/../libcpp/libcpp.a
 .endif
 
 .if exists(${.OBJDIR}/../libdecnumber)
 LIBDECNUMBER=	${.OBJDIR}/../libdecnumber/libdecnumber.a
 .else
 LIBDECNUMBER=	${.CURDIR}/../libdecnumber/libdecnumber.a
 .endif
 
 .endif # !__CC_MAKEFILE_INC__
diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc
index 2f9b9cee174c..0d20034f6bc9 100644
--- a/usr.sbin/wpa/Makefile.inc
+++ b/usr.sbin/wpa/Makefile.inc
@@ -1,27 +1,29 @@
 # $FreeBSD$
 
 BINDIR?=	/usr/sbin
 
 WPA_DISTDIR?= 		${.CURDIR}/../../../contrib/wpa/
 WPA_SUPPLICANT_DISTDIR?=${WPA_DISTDIR}/wpa_supplicant
 HOSTAPD_DISTDIR?=	${WPA_DISTDIR}/hostapd
 
 .PATH.c:${.CURDIR}/.. \
 	${WPA_DISTDIR}/src/common \
 	${WPA_DISTDIR}/src/crypto \
 	${WPA_DISTDIR}/src/eap_common \
 	${WPA_DISTDIR}/src/eapol_supp \
 	${WPA_DISTDIR}/src/l2_packet \
 	${WPA_DISTDIR}/src/utils
 
 CFLAGS+=-I${.CURDIR}
 CFLAGS+=-I${WPA_DISTDIR}/src
 CFLAGS+=-I${WPA_DISTDIR}/src/common
 CFLAGS+=-I${WPA_DISTDIR}/src/crypto
 CFLAGS+=-I${WPA_DISTDIR}/src/l2_packet
 CFLAGS+=-I${WPA_DISTDIR}/src/utils
 
 CFLAGS+= -DCONFIG_CTRL_IFACE
 CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX
 
+CSTD=	gnu89	# XXX
+
 .include <bsd.own.mk>