diff --git a/app/xdriinfo/Makefile.am b/app/xdriinfo/Makefile.am
index c5cce1d79..9a4376d2c 100644
--- a/app/xdriinfo/Makefile.am
+++ b/app/xdriinfo/Makefile.am
@@ -21,8 +21,6 @@
 bin_PROGRAMS = xdriinfo
 
 xdriinfo_CFLAGS = $(XDRIINFO_CFLAGS)
-# mesa should really use pkg-config ...
-xdriinfo_LDADD = $(XDRIINFO_LIBS)
 
 xdriinfo_SOURCES =	\
         xdriinfo.c
diff --git a/app/xdriinfo/configure.ac b/app/xdriinfo/configure.ac
index 3bab4d540..a5d9af4ff 100644
--- a/app/xdriinfo/configure.ac
+++ b/app/xdriinfo/configure.ac
@@ -46,6 +46,7 @@ AC_SEARCH_LIBS([glXGetProcAddressARB], [GL], [],
 	AC_MSG_FAILURE([cannot find GL library - make sure Mesa or other OpenGL package is installed]),
 	[$XDRIINFO_LIBS])
 
+LIBS="$LIBS $XDRIINFO_LIBS"
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION