diff --git a/ChangeLog b/ChangeLog
index 4544dfc16..4f22b257c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,8 @@
 
 	* configure.ac:
 	Put DMX AC_CONDITIONALS at the top level, since they must always be
-	called.  Add missing resourceproto to REQUIRED_MODULES.
+	called.  Add missing resourceproto, fontenc, and fontsproto to
+	REQUIRED_MODULES.
 
 	* configure.ac:
 	* include/xorg-config.h.in:
diff --git a/configure.ac b/configure.ac
index c253af603..0f84c7980 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,7 +274,7 @@ XEXT_INC='-I$(top_srcdir)/Xext'
 XEXT_LIB='$(top_builddir)/Xext/libXext.la'
 
 dnl Core modules for most extensions, et al.
-REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xcmiscproto xextproto xfont xproto xtrans xau xf86dgaproto xf86miscproto xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto resourceproto"
+REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xcmiscproto xextproto xfont xproto xtrans xau xf86dgaproto xf86miscproto xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto resourceproto fontenc fontsproto"
 
 AM_CONDITIONAL(XV, [test "x$XV" = xyes])
 if test "x$XV" = xyes; then