diff --git a/cfg/checks/check_features.mk b/cfg/checks/check_features.mk
index 3a5dd50..33c937b 100644
--- a/cfg/checks/check_features.mk
+++ b/cfg/checks/check_features.mk
@@ -1,10 +1,9 @@
 CHECKS_DIR = $(CFG_DIR)/checks
 
-# Check if we can use X11
-CHECK_X11_LIBS = $(shell pkg-config --exists x11 || echo -n "error")
-ifneq ($(CHECK_X11_LIBS), error)
-	LIBS += x11
-	CFLAGS += -D_X11
+# Check if we want build X11 support
+X11 = $(shell if [ -z "$(DISABLE_X11)" ] || [ "$(DISABLE_X11)" = "0" ] ; then echo enabled ; else echo disabled ; fi)
+ifneq ($(X11), disabled)
+	-include $(CHECKS_DIR)/x11.mk
 endif
 
 # Check if we want build audio support
diff --git a/cfg/checks/x11.mk b/cfg/checks/x11.mk
new file mode 100644
index 0000000..2cee978
--- /dev/null
+++ b/cfg/checks/x11.mk
@@ -0,0 +1,17 @@
+# Variables for X11 support
+X11_LIBS = x11
+X11_CFLAGS = -D_X11
+
+# Check if we can build X11 support
+CHECK_X11_LIBS = $(shell pkg-config --exists $(X11_LIBS) || echo -n "error")
+ifneq ($(CHECK_X11_LIBS), error)
+       LIBS += $(X11_LIBS)
+       CFLAGS += $(X11_CFLAGS)
+else
+ifneq ($(MAKECMDGOALS), clean)
+MISSING_X11_LIBS = $(shell for lib in $(X11_LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done)
+$(warning WARNING -- Toxic will be compiled without x11 support (needed for focus tracking))
+$(warning WARNING -- You need these libraries for x11 support)
+$(warning WARNING -- $(MISSING_X11_LIBS))
+endif
+endif