diff --git a/libvdpau.changes b/libvdpau.changes
index b5e40e7..5c49ecb 100644
--- a/libvdpau.changes
+++ b/libvdpau.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Apr 22 22:34:09 UTC 2010 - herbert@graeber-clan.de
+
+- put libvdpau_trace into it's own package
+
+-------------------------------------------------------------------
+Thu Apr 22 18:11:59 UTC 2010 - herbert@graeber-clan.de
+
+- follow Shared Library Packaging Policy
+- obsolete packman vdpau packages for proper update
+
 -------------------------------------------------------------------
 Thu Apr 22 02:33:32 CEST 2010 - sndirsch@suse.de
 
diff --git a/libvdpau.spec b/libvdpau.spec
index dab7ca9..e9a0b31 100644
--- a/libvdpau.spec
+++ b/libvdpau.spec
@@ -19,9 +19,9 @@
 
 Name:           libvdpau
 Version:        0.4
-Release:        1
+Release:        2
 License:        MIT License (or similar)
-Summary:        libvdpau wrapper and libvdpau_trace debugging library
+Summary:        VDPAU wrapper and trace libraries
 Url:            http://people.freedesktop.org/~aplattner
 Group:          System/Libraries
 Source:         %{name}-%{version}.tar.gz
@@ -37,14 +37,43 @@ applications.  To actually use a VDPAU device, you need a vendor-specific
 implementation library.  Currently, this is always libvdpau_nvidia.  You can
 override the driver name by setting the VDPAU_DRIVER environment variable.
 
+%package -n libvdpau1
+License:        MIT License (or similar)
+Summary:        VDPAU wrapper library
+Group:          System/Libraries
+Provides:       libvdpau = %{version}-%{release}
+Obsoletes:      libvdpau < %{version}-%{release}
+
+%description -n libvdpau1
+This package contains the libvdpau wrapper library and the libvdpau_trace
+debugging library, along with the header files needed to build VDPAU
+applications.  To actually use a VDPAU device, you need a vendor-specific
+implementation library.  Currently, this is always libvdpau_nvidia.  You can
+override the driver name by setting the VDPAU_DRIVER environment variable.
+
 %package -n libvdpau-devel
 License:        MIT License (or similar)
-Summary:        libvdpau wrapper and libvdpau_trace debugging library - development files
+Summary:        VDPAU wrapper development files
 Group:          Development/Libraries/X11
-Requires:       libvdpau = %{version}
+Requires:       libvdpau1 = %{version}
 
 %description -n libvdpau-devel
-Development files for libvdpau wrapper and libvdpau_trace debugging library.
+Note that this package only contains the VDPAU headers that are required to
+build applications. At runtime, the shared libraries are needed too and may
+be installed using the proprietary nVidia driver packages.
+
+%package -n libvdpau_trace1
+License:        MIT License (or similar)
+Summary:        VDPAU trace library
+Group:          Development/Libraries/X11
+Requires:       libvdpau1 = %{version}
+Provides:       libvdpau_trace = %{version}-%{release}
+Obsoletes:      libvdpau_trace < %{version}-%{release}
+
+%description -n libvdpau_trace1
+This package provides a fallback, fake VDPAU implementation for runtime, which
+is used when no proper VDPAU implementation library is available (such as
+libvdpau_nvidia.so)
 
 %prep
 %setup -q
@@ -58,16 +87,16 @@ make %{?jobs:-j%jobs}
 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
 
-%post -n libvdpau -p /sbin/ldconfig
+%post -n libvdpau1 -p /sbin/ldconfig
 
-%postun -n libvdpau -p /sbin/ldconfig
+%postun -n libvdpau1 -p /sbin/ldconfig
 
-%files -n libvdpau
+%files -n libvdpau1
 %defattr(-,root,root)
 %dir %{_libdir}/vdpau
 %{_libdir}/libvdpau.so.*
-%{_libdir}/vdpau/*.so.*
 
 %files -n libvdpau-devel
 %defattr(-,root,root)
@@ -75,7 +104,10 @@ rm %{buildroot}%{_libdir}/vdpau/libvdpau_trace.la
 %dir %{_libdir}/vdpau
 %{_includedir}/vdpau
 %{_libdir}/libvdpau.so
-%{_libdir}/vdpau/*.so
 %{_libdir}/pkgconfig/vdpau.pc
 
+%files -n libvdpau_trace1
+%defattr(-,root,root)
+%{_libdir}/vdpau/libvdpau_trace.so.*
+
 %changelog
diff --git a/rpmlintrc b/rpmlintrc
new file mode 100644
index 0000000..923dbcb
--- /dev/null
+++ b/rpmlintrc
@@ -0,0 +1,3 @@
+# dir isn't version, but it's contents is
+addFilter("shlib-policy-nonversioned-dir")
+addFilter("no-dependency-on")