diff --git a/etc/config.site b/etc/config.site
new file mode 100644
index 000000000..d8dfc30c1
--- /dev/null
+++ b/etc/config.site
@@ -0,0 +1,23 @@
+# $OpenBSD: config.site,v 1.1 2008/05/11 20:58:10 matthieu Exp $
+ac_cv_c_compiler_gnu=${ac_cv_c_compiler_gnu=yes}
+ac_cv_c_const=${ac_cv_c_const=yes}
+ac_cv_cxx_compiler_gnu=${ac_cv_cxx_compiler_gnu=yes}
+ac_cv_f77_compiler_gnu=${ac_cv_f77_compiler_gnu=yes}
+ac_cv_path_CPP_PATH=${ac_cv_path_CPP_PATH=/usr/bin/cpp}
+ac_cv_path_GZIP=${ac_cv_path_GZIP=/usr/bin/gzip}
+ac_cv_path_MKTEMP_COMMAND=${ac_cv_path_MKTEMP_COMMAND=/usr/bin/mktemp}
+ac_cv_path_PERL=${ac_cv_path_PERL=/usr/bin/perl}
+ac_cv_path_RAWCPP=${ac_cv_path_RAWCPP=/usr/bin/cpp}
+ac_cv_path_RSH=${ac_cv_path_RSH=/usr/bin/rsh}
+ac_cv_path_SED=${ac_cv_path_SED=/usr/bin/sed}
+ac_cv_path_ac_pt_PKG_CONFIG=${ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config}
+ac_cv_path_install=${ac_cv_path_install='/usr/bin/install -c'}
+ac_cv_prog_AWK=${ac_cv_prog_AWK=nawk}
+ac_cv_prog_HAS_PERL=${ac_cv_prog_HAS_PERL=yes}
+ac_cv_prog_LAUNCHD=${ac_cv_prog_LAUNCHD=no}
+ac_cv_prog_LEX=${ac_cv_prog_LEX=flex}
+ac_cv_prog_YACC=${ac_cv_prog_YACC='yacc'}
+ac_cv_prog_lex_root=${ac_cv_prog_lex_root=lex.yy}
+ac_cv_prog_lex_yytext_pointer=${ac_cv_prog_lex_yytext_pointer=yes}
+ac_cv_prog_make_make_set=${ac_cv_prog_make_make_set=yes}
+lt_cv_sys_max_cmd_len=${lt_cv_sys_max_cmd_len=131072}
diff --git a/share/mk/bsd.xorg.mk b/share/mk/bsd.xorg.mk
index 88b13eb31..0ef87e748 100644
--- a/share/mk/bsd.xorg.mk
+++ b/share/mk/bsd.xorg.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.xorg.mk,v 1.24 2008/03/25 23:28:19 matthieu Exp $ -*- makefile  -*-
+# $OpenBSD: bsd.xorg.mk,v 1.25 2008/05/11 20:58:10 matthieu Exp $ -*- makefile  -*-
 #
 # Copyright © 2006 Matthieu Herrb
 #
@@ -44,7 +44,12 @@ _cache= --cache-file=${XOBJDIR}/xorg-config.cache.${MACHINE}
 
 CFLAGS+=	$(COPTS)
 
+.if !defined(CONFIG_SITE)
+CONFIG_SITE=	${XSRCDIR}/etc/config.site
+.endif
+
 CONFIGURE_ENV=	PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" \
+		CONFIG_SITE=$(CONFIG_SITE) \
 		XMLTO=: \
 		CFLAGS="$(CFLAGS:C/ *$//)" \
 		MAKE="${MAKE}"