diff --git a/libvdpau-missing-lX11.diff b/libvdpau-missing-lX11.diff
new file mode 100644
index 0000000..b826eb3
--- /dev/null
+++ b/libvdpau-missing-lX11.diff
@@ -0,0 +1,8 @@
+--- vdpau.pc.in.orig	2011-08-29 12:24:17.000000000 +0000
++++ vdpau.pc.in	2011-08-29 12:24:48.000000000 +0000
+@@ -9,4 +9,4 @@ Description: The Video Decode and Presen
+ Version: @PACKAGE_VERSION@
+ Requires.private: x11
+ Cflags: -I${includedir}
+-Libs: -L${libdir} -lvdpau
++Libs: -L${libdir} -lvdpau -lX11
diff --git a/libvdpau.changes b/libvdpau.changes
index a2f53fc..bdfc07d 100644
--- a/libvdpau.changes
+++ b/libvdpau.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug 29 12:19:11 UTC 2011 - sndirsch@suse.com
+
+- vdpau needs an explicit "-lX11" with latest toolchain
+
 -------------------------------------------------------------------
 Wed Sep 22 07:19:14 UTC 2010 - coolo@novell.com
 
diff --git a/libvdpau.spec b/libvdpau.spec
index 9c766fa..92c3c95 100644
--- a/libvdpau.spec
+++ b/libvdpau.spec
@@ -29,6 +29,7 @@ Source1:        vdpauinfo-0.0.6.tar.gz
 Source2:        README
 Source99:       baselibs.conf
 Source100:      %{name}-rpmlintrc
+Patch:          libvdpau-missing-lX11.diff
 BuildRequires:  gcc-c++ pkgconfig xorg-x11-devel
 BuildRequires:  doxygen graphviz texlive
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -79,6 +80,7 @@ Its usage is documented in the README.
 
 %prep
 %setup -q -b1
+%patch -p0
 
 %build
 %configure
@@ -93,7 +95,7 @@ rm %{buildroot}%{_libdir}/vdpau/libvdpau_trace.so
 pushd ../vdpauinfo-*
 %configure \
 VDPAU_CFLAGS=-I$RPM_BUILD_ROOT/usr/include \
-VDPAU_LIBS="-L$RPM_BUILD_ROOT/%{_libdir} -lvdpau"
+VDPAU_LIBS="-L$RPM_BUILD_ROOT/%{_libdir} -lvdpau -lX11"
 make %{?jobs:-j%jobs}
 %makeinstall
 popd