diff --git a/configure.ac b/configure.ac
index ca9f3b3..fe8b1de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,12 +150,11 @@ AM_CONDITIONAL(HAVE_LIBSSL, test ! -z "$SSL_LIBS")
 
 
 # See if we want libva support
-# TODO: check if library actually exists
 AH_TEMPLATE(CONFIG_LIBVA, [Build libva support])
 AC_ARG_WITH(libva,
-[  --with-libva                   build libva support],,)
+[  --without-libva         disable support for libva],,)
 if test "x$with_libva" != "xno"; then
-    AC_CHECK_LIB(va, vaInitialize,
+    AC_CHECK_LIB(va-x11, vaGetDisplay,
         VA_LIBS="-lva -lva-x11"
         [AC_DEFINE(CONFIG_LIBVA) CONFIG_LIBVA="true"], ,)
 fi
diff --git a/libvncclient/h264.c b/libvncclient/h264.c
index 1d94454..c63a713 100644
--- a/libvncclient/h264.c
+++ b/libvncclient/h264.c
@@ -20,6 +20,10 @@
 #ifdef LIBVNCSERVER_CONFIG_LIBVA
 
 #include <X11/Xlib.h>
+#include <va/va_version.h>
+#if VA_CHECK_VERSION(0,34,0)
+#include <va/va_compat.h>
+#endif
 #include <va/va_x11.h>
 
 enum _slice_types {