diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 14164fbeb..2cf9eaf01 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -442,4 +442,7 @@
 /* Use only built-in fonts */
 #undef BUILTIN_FONTS
 
+/* Avoid using font servers */
+#undef NOFONTSERVERACCESS
+
 #endif /* _DIX_CONFIG_H_ */