diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index b25e9a600..1b56256b4 100644
--- a/cde/config/cf/FreeBSD.cf
+++ b/cde/config/cf/FreeBSD.cf
@@ -73,6 +73,12 @@ USE_GCC = UseGcc
 # define HasGcc2		YES
 #endif
 
+/* Use installed X11 includes/libs on FreeBSD 11+ */
+#if (OSMajorVersion >= 11)
+#define UseInstalledX11         YES
+#endif
+
+
 /* For DtHelp TIFF processing routines. */
 #ifdef AMD64Architecture
 #define LSBBitOrder             YES
diff --git a/cde/config/imake/Makefile.ini b/cde/config/imake/Makefile.ini
index 6c93094fc..30e311c08 100644
--- a/cde/config/imake/Makefile.ini
+++ b/cde/config/imake/Makefile.ini
@@ -11,7 +11,7 @@
 BOOTSTRAPCFLAGS = 
 CC = cc
 CDEBUGFLAGS = -O
-INCLUDES = -I../../include -I/usr/include/X11 -I../../imports/x11/include/X11
+INCLUDES = -I../../include -I/usr/local/include/X11 -I/usr/include/X11 -I../../imports/x11/include/X11
 CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES)
 SHELL = /bin/sh
 RM = rm -f