diff --git a/ChangeLog b/ChangeLog
index a3756ca9f1..49692bba87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-22  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* configure.ac:
+	Check for X for the nas plugin to make it possible to build it
+	again. Fixes bug #517895.
+
 2008-02-22  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* tests/check/Makefile.am:
diff --git a/configure.ac b/configure.ac
index 47bd9cd3f5..3a14b814fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -733,6 +733,7 @@ dnl *** nas ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_NAS, true)
 AG_GST_CHECK_FEATURE(NAS, [nas plug-in], nassink, [
   HAVE_NAS="no"
+  AG_GST_CHECK_X
   if test "x$HAVE_X" = "xyes"; then
     save_cppflags=$CFLAGS
     CPPFLAGS="$CPPFLAGS $X_CFLAGS"