--- a/configure.ac	2016-06-16 07:34:31.000000000 -0400
+++ b/configure.ac	2016-08-17 15:41:03.322532729 -0400
@@ -163,6 +163,13 @@
 AM_CONDITIONAL([WITH_DISPLAY_WINDOWS], [test "x$have_win32" = "xyes"])
 
 AC_CHECK_HEADERS([X11/XKBlib.h])
+AS_IF([test "x$have_quartz" != "xyes"],[
+  AS_IF([test "x$have_win32" != "xyes"],[
+    PKG_CHECK_MODULES(X11,x11)
+  ])
+])
+AC_SUBST(X11_CFLAGS)
+AC_SUBST(X11_LIBS)
 
 AC_ARG_WITH([pnp-ids-path],
   AC_HELP_STRING([--with-pnp-ids-path],
--- a/src/Makefile.am	2016-08-17 15:44:42.081663331 -0400
+++ b/src/Makefile.am	2016-08-17 15:45:24.701493950 -0400
@@ -100,6 +100,7 @@
 	$(GUDEV_CFLAGS)						\
 	$(SOUP_CFLAGS)						\
 	$(PHODAV_CFLAGS)					\
+	$(X11_CFLAGS)					\
 	$(LZ4_CFLAGS)					\
 	$(NULL)
 
@@ -119,6 +120,7 @@
 	libspice-client-glib-2.0.la	\
 	$(GTK_LIBS)			\
 	$(CAIRO_LIBS)			\
+	$(X11_LIBS)			\
 	$(LIBM)				\
 	$(NULL)