diff --git a/app/xlockmore/Makefile.bsd-wrapper b/app/xlockmore/Makefile.bsd-wrapper
index a151374c5..618a9ac07 100644
--- a/app/xlockmore/Makefile.bsd-wrapper
+++ b/app/xlockmore/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.12 2014/08/13 21:02:16 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.13 2017/03/07 21:35:57 naddy Exp $
 
 .include <bsd.xconf.mk>
 
@@ -6,7 +6,10 @@ config.status:
 	AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \
 	AUTOCONF_VERSION="$(AUTOCONF_VERSION)" \
 	ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \
+	CC="${CC}" \
 	CFLAGS="${CFLAGS}" \
+	CXX="${CXX}" \
+	CXXFLAGS="${CXXFLAGS}" \
 	PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
 	CONFIG_SITE=$(CONFIG_SITE) \
 		sh ${.CURDIR}/configure --prefix=${X11BASE} \
diff --git a/share/mk/bsd.xorg.mk b/share/mk/bsd.xorg.mk
index 961353287..1aad96dfb 100644
--- a/share/mk/bsd.xorg.mk
+++ b/share/mk/bsd.xorg.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.xorg.mk,v 1.58 2017/02/12 18:19:54 matthieu Exp $ -*- makefile  -*-
+# $OpenBSD: bsd.xorg.mk,v 1.59 2017/03/07 21:35:58 naddy Exp $ -*- makefile  -*-
 #
 # Copyright © 2006,2012 Matthieu Herrb
 #
@@ -56,7 +56,10 @@ XENOCARA_PATH?=	/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin
 
 CONFIGURE_ENV=	PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" \
 		CONFIG_SITE=$(CONFIG_SITE) \
+		CC="$(CC)" \
 		CFLAGS="$(CFLAGS:C/ *$//)" \
+		CXX="$(CXX)" \
+		CXXFLAGS="$(CXXFLAGS:C/ *$//)" \
 		MAKE="${MAKE}"
 
 CONFIGURE_ARGS+= --disable-silent-rules