diff --git a/autogen.sh b/autogen.sh
index b5698a6..f99b10d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,4 +18,4 @@ which gnome-autogen.sh || {
     echo "You need to install gnome-common from the GNOME CVS"
     exit 1
 }
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+. gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index aec9c15..afde948 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,7 @@ PKG_CHECK_MODULES(GREETER, [
     gtk+-3.0
     webkit2gtk-4.0
     dbus-glib-1
+    x11
 ])
 
 PKG_CHECK_MODULES(WEB_EXTENSION, [webkit2gtk-4.0 >= 2.8.0])
diff --git a/src/Makefile.am b/src/Makefile.am
index af0f896..3043303 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,8 @@ lightdm_webkit2_greeter_CFLAGS = \
 	-DBINARY=\"lightdm-webkit2-greeter\"
 
 lightdm_webkit2_greeter_LDADD = \
-	$(GREETER_LIBS)
+	$(GREETER_LIBS) \
+	$(LIBX11_LIBS)
 
 DISTCLEANFILES = \
 	Makefile.in
diff --git a/src/lightdm-webkit2-greeter.c b/src/lightdm-webkit2-greeter.c
index 48c093a..2188f94 100644
--- a/src/lightdm-webkit2-greeter.c
+++ b/src/lightdm-webkit2-greeter.c
@@ -16,6 +16,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <glib.h>
+#include <glib-unix.h>
 #include <gtk/gtkx.h>
 #include <webkit2/webkit2.h>
 #include <JavaScriptCore/JavaScript.h>
@@ -72,7 +73,7 @@ wm_window_filter (GdkXEvent *gxevent, GdkEvent *event, gpointer  data)
 
         XGetInputFocus (xevent->xunmap.display, &xwin, &revert_to);
         if (revert_to == RevertToNone)
-            gdk_window_lower (gtk_widget_get_window (gtk_widget_get_toplevel (GTK_WIDGET (screen_overlay))));
+            gdk_window_lower (gtk_widget_get_window (gtk_widget_get_toplevel (GTK_WIDGET (window))));
     }
 
     return GDK_FILTER_CONTINUE;