diff --git a/configure.ac b/configure.ac
index f9e8c815..a68e95cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,13 +173,16 @@ if test "x$XLOCALEDIR" == "xno"; then
 fi
 AC_MSG_RESULT($XLOCALEDIR)
 
-AC_MSG_CHECKING([if XF86BigFont support should be enabled])
 AC_ARG_ENABLE(xf86bigfont,
 	      AC_HELP_STRING([--disable-xf86bigfont],
 		[Disable XF86BigFont extension support]),
 	      [XF86BIGFONT=$enableval],[XF86BIGFONT="yes"])
 if test "x$XF86BIGFONT" == "xyes"; then
+    PKG_CHECK_MODULES(BIGFONTPROTO, xf86bigfontproto
 	AC_DEFINE(XF86BIGFONT,1,[Enable XF86BIGFONT extension])
+        X11_CFLAGS="$X11_CFLAGS $BIGFONTPROTO_CFLAGS"
+        X11_LIBS="$X11_LIBS $BIGFONTPROTO_CFLAGS",
+        XF86BIGFONT="no")
 fi
 AC_MSG_RESULT($XF86BIGFONT)