diff --git a/Mesa.changes b/Mesa.changes
index 945fc0f..c26c05e 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 12 15:53:50 UTC 2012 - sndirsch@suse.com
+
+- enabled build of XvMC/VDPAU state trackers for Nouveau, R300,
+  R600, Softpipe (Software implementation)
+
 -------------------------------------------------------------------
 Tue Jun 12 10:19:01 UTC 2012 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 79ee833..d897943 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -58,6 +58,8 @@ BuildRequires:  pkgconfig(xxf86vm)
 %ifarch %ix86 x86_64
 BuildRequires:  llvm-devel
 %endif
+BuildRequires:  libXvMC-devel
+BuildRequires:  libvdpau-devel
 BuildRequires:  vim
 Url:            http://www.mesa3d.org
 Provides:       Mesa7 = %{version}
@@ -385,6 +387,61 @@ video driver.
 This package provides the development environment for compiling
 programs against the XA state tracker.
 
+%package -n libXvMC_nouveau
+Summary:        XVMC state tracker for Nouveau
+Group:          System/Libraries
+
+%description -n libXvMC_nouveau
+This package contains the XvMC state tracker for Nouveau.
+
+%package -n libXvMC_r300
+Summary:        XVMC state tracker for R300
+Group:          System/Libraries
+
+%description -n libXvMC_r300
+This package contains the XvMC state tracker for R300.
+
+%package -n libXvMC_r600
+Summary:        XVMC state tracker for R600
+Group:          System/Libraries
+
+%description -n libXvMC_r600
+This package contains the XvMC state tracker for R600.
+
+%package -n libXvMC_softpipe
+Summary:        Software implementation of XVMC state tracker
+Group:          System/Libraries
+
+%description -n libXvMC_softpipe
+This package contains the Software implementation of the XvMC state tracker.
+
+%package -n libvdpau_nouveau
+Summary:        XVMC state tracker for Nouveau
+Group:          System/Libraries
+
+%description -n libvdpau_nouveau
+This package contains the VDPAU state tracker for Nouveau.
+
+%package -n libvdpau_r300
+Summary:        XVMC state tracker for R300
+Group:          System/Libraries
+
+%description -n libvdpau_r300
+This package contains the VDPAU state tracker for R300.
+
+%package -n libvdpau_r600
+Summary:        XVMC state tracker for R600
+Group:          System/Libraries
+
+%description -n libvdpau_r600
+This package contains the VDPAU state tracker for R600.
+
+%package -n libvdpau_softpipe
+Summary:        Software implementation of XVMC state tracker
+Group:          System/Libraries
+
+%description -n libvdpau_softpipe
+This package contains the Software implementation of the VDPAU state tracker.
 
 %package -n Mesa-libglapi0
 Summary:        Free implementation of the GL API
@@ -430,6 +487,8 @@ autoreconf -fi
            --enable-gallium-llvm \
            --with-dri-drivers=i915,i965,nouveau,r200,radeon \
            --with-gallium-drivers=r300,r600,nouveau,swrast,svga \
+           --enable-vdpau \
+           --enable-xvmc \
 %endif
 %ifarch ia64 ppc ppc64 %sparc hppa
            --with-dri-drivers=nouveau,r200,radeon \
@@ -509,6 +568,27 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
 %post   -n libxatracker1 -p /sbin/ldconfig
 
 %postun -n libxatracker1 -p /sbin/ldconfig
+
+%post   -n libXvMC_nouveau
+%postun -n libXvMC_nouveau
+
+%post   -n libXvMC_r300
+%postun -n libXvMC_r300
+
+%post   -n libXvMC_r600
+%postun -n libXvMC_r600
+
+%post   -n libXvMC_softpipe
+%postun -n libXvMC_softpipe
+
+%post   -n libvdpau_r300
+%postun -n libvdpau_r300
+
+%post   -n libvdpau_r600
+%postun -n libvdpau_r600
+
+%post   -n libvdpau_softpipe
+%postun -n libvdpau_softpipe
 %endif
 
 %post   -n Mesa-libglapi0 -p /sbin/ldconfig
@@ -607,6 +687,54 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
 %_includedir/xa_*.h
 %_libdir/libxatracker.so
 %_libdir/pkgconfig/xatracker.pc
+
+%files -n libXvMC_nouveau
+%defattr(-,root,root)
+%_libdir/libXvMCnouveau.so
+%_libdir/libXvMCnouveau.so.1
+%_libdir/libXvMCnouveau.so.1.0
+
+%files -n libXvMC_r300 
+%defattr(-,root,root)
+%_libdir/libXvMCr300.so
+%_libdir/libXvMCr300.so.1
+%_libdir/libXvMCr300.so.1.0
+
+%files -n libXvMC_r600 
+%defattr(-,root,root)
+%_libdir/libXvMCr600.so
+%_libdir/libXvMCr600.so.1
+%_libdir/libXvMCr600.so.1.0
+
+%files -n libXvMC_softpipe
+%defattr(-,root,root)
+%_libdir/libXvMCsoftpipe.so
+%_libdir/libXvMCsoftpipe.so.1
+%_libdir/libXvMCsoftpipe.so.1.0
+
+%files -n libvdpau_nouveau
+%defattr(-,root,root)
+%_libdir/vdpau/libvdpau_nouveau.so
+%_libdir/vdpau/libvdpau_nouveau.so.1
+%_libdir/vdpau/libvdpau_nouveau.so.1.0
+
+%files -n libvdpau_r300
+%defattr(-,root,root)
+%_libdir/vdpau/libvdpau_r300.so
+%_libdir/vdpau/libvdpau_r300.so.1
+%_libdir/vdpau/libvdpau_r300.so.1.0
+
+%files -n libvdpau_r600
+%defattr(-,root,root)
+%_libdir/vdpau/libvdpau_r600.so
+%_libdir/vdpau/libvdpau_r600.so.1
+%_libdir/vdpau/libvdpau_r600.so.1.0
+
+%files -n libvdpau_softpipe
+%defattr(-,root,root)
+%_libdir/vdpau/libvdpau_softpipe.so
+%_libdir/vdpau/libvdpau_softpipe.so.1
+%_libdir/vdpau/libvdpau_softpipe.so.1.0
 %endif
 
 %files -n Mesa-libglapi0
diff --git a/baselibs.conf b/baselibs.conf
index 4fc5a85..b91beec 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -42,3 +42,11 @@ libgbm-devel
 	requires -libgbm-<targettype>
 	requires "libgbm1-<targettype> = <version>"
 Mesa-libglapi0
+libXvMC_nouveau
+libXvMC_r300
+libXvMC_r600
+libXvMC_softpipe
+libvdpau_nouveau
+libvdpau_r300
+libvdpau_r600
+libvdpau_softpipe