diff --git a/libvdpau.changes b/libvdpau.changes
index 5c49ecb..d3c3ebb 100644
--- a/libvdpau.changes
+++ b/libvdpau.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Apr 24 10:37:30 CEST 2010 - sndirsch@suse.de
+
+- added Wladimir J. van der Laan's vdpinfo tool, a command line
+  utility for querying the capabilities of a VDPAU device.
+
 -------------------------------------------------------------------
 Thu Apr 22 22:34:09 UTC 2010 - herbert@graeber-clan.de
 
diff --git a/libvdpau.spec b/libvdpau.spec
index e9a0b31..44609a6 100644
--- a/libvdpau.spec
+++ b/libvdpau.spec
@@ -19,12 +19,13 @@
 
 Name:           libvdpau
 Version:        0.4
-Release:        2
+Release:        3
 License:        MIT License (or similar)
 Summary:        VDPAU wrapper and trace libraries
 Url:            http://people.freedesktop.org/~aplattner
 Group:          System/Libraries
 Source:         %{name}-%{version}.tar.gz
+Source1:        vdpauinfo-0.0.6.tar.gz
 Source99:       baselibs.conf
 BuildRequires:  gcc-c++ pkgconfig xorg-x11-devel
 BuildRequires:  doxygen graphviz texlive
@@ -76,7 +77,7 @@ is used when no proper VDPAU implementation library is available (such as
 libvdpau_nvidia.so)
 
 %prep
-%setup -q
+%setup -q -b1
 
 %build
 %configure
@@ -88,6 +89,13 @@ rm %{buildroot}%{_libdir}/libvdpau.la
 rm %{buildroot}%{_libdir}/vdpau/libvdpau_trace.la
 /sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}/vdpau
 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"
+make %{?jobs:-j%jobs}
+%makeinstall
+popd
 
 %post -n libvdpau1 -p /sbin/ldconfig
 
@@ -96,6 +104,7 @@ rm %{buildroot}%{_libdir}/vdpau/libvdpau_trace.so
 %files -n libvdpau1
 %defattr(-,root,root)
 %dir %{_libdir}/vdpau
+/usr/bin/vdpauinfo
 %{_libdir}/libvdpau.so.*
 
 %files -n libvdpau-devel
diff --git a/vdpauinfo-0.0.6.tar.gz b/vdpauinfo-0.0.6.tar.gz
new file mode 100644
index 0000000..c67aea1
--- /dev/null
+++ b/vdpauinfo-0.0.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:52bb5d817b16984aca2d410584150cd35551bdfd6346688a377d406e25a65454
+size 77375