diff --git a/configure.ac b/configure.ac
index 0cfe8def9..deecd1faa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,6 +128,11 @@ AC_ARG_WITH([wayland-protocols],
             ],
             [])
 
+AC_ARG_WITH([xwayland-path],
+            [AS_HELP_STRING([--with-xwayland-path], [Absolute path for an X Wayland server])],
+            [XWAYLAND_PATH="$withval"],
+            [XWAYLAND_PATH="$bindir/Xorg"])
+
 AM_GLIB_GNU_GETTEXT
 
 ## here we get the flags we'll actually use
@@ -235,6 +240,8 @@ if test x$enable_wayland = "xyes"; then
         AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols]))
   AC_SUBST([WAYLAND_SCANNER])
 
+  AC_SUBST(XWAYLAND_PATH)
+
   MUTTER_PC_MODULES="$MUTTER_PC_MODULES wayland-server clutter-wayland-compositor-1.0"
   AC_DEFINE(HAVE_WAYLAND, , [Building with Wayland support])
   have_wayland=yes
diff --git a/src/Makefile.am b/src/Makefile.am
index 7a1192676..c0884c58a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,6 +29,12 @@ INCLUDES=								\
 	-DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\"			\
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
 
+if HAVE_WAYLAND
+INCLUDES += \
+	-I$(srcdir)/wayland						\
+	-DXWAYLAND_PATH='"@XWAYLAND_PATH@"'
+endif
+
 mutter_built_sources = \
 	mutter-enum-types.h \
 	mutter-enum-types.c