diff --git a/libmfx.changes b/libmfx.changes
index cc8160e..2bb9569 100644
--- a/libmfx.changes
+++ b/libmfx.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Aug  3 09:03:23 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Move samples into a new subpackage
+- The library does not depend on the tools, drop Requires
+- Apply patch unconditionally, use %autosetup
+- Move LICENSE to library package
+- Make the sover part of %files
+- Don't bother building tests, they're not run anyway
+
 -------------------------------------------------------------------
 Mon Mar 16 12:40:37 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/libmfx.spec b/libmfx.spec
index 7eeca80..41b6a44 100644
--- a/libmfx.spec
+++ b/libmfx.spec
@@ -16,8 +16,9 @@
 #
 
 
+%global sover 1
 Name:           libmfx
-%define lname   libmfx1
+%define lname   libmfx%{sover}
 Version:        19.4.0
 Release:        0
 Summary:        The Intel Media SDK
@@ -47,7 +48,6 @@ platforms. The implementation is written in C++11, with parts in C-for-Media
 %package -n %lname
 Summary:        The Intel Media SDK
 Group:          System/Libraries
-Requires:       %{name}
 
 %description -n %lname
 The Intel Media SDK provides a plain C API to access hardware-accelerated
@@ -64,12 +64,15 @@ Requires:       %lname = %version
 This package contains the development headers and pkgconfig files for
 the Intel Media SDK.
 
+%package samples
+Summary:        Examples for the Intel Media SDK
+Group:          Development/Languages/C and C++
+
+%description samples
+This package contains example applications for the Intel Media SDK.
+
 %prep
-%setup -q -n MediaSDK-intel-mediasdk-%{version}
-%if 0%{?suse_version} < 1500
-%patch0 -p1
-%endif
-%patch1 -p1
+%autosetup -p1 -n MediaSDK-intel-mediasdk-%{version}
 
 %build
 mkdir -p build 
@@ -84,7 +87,7 @@ cmake \
 -DENABLE_WAYLAND:BOOL=ON \
 -DENABLE_TEXTLOG:BOOL=ON \
 -DENABLE_STAT:BOOL=ON \
--DBUILD_TESTS:BOOL=ON \
+-DBUILD_TESTS:BOOL=OFF \
 -DBUILD_TOOLS:BOOL=ON \
 -DENABLE_ITT:BOOL=OFF \
 -DBUILD_KERNELS:BOOL=OFF \
@@ -107,26 +110,27 @@ rmdir %{buildroot}/%{_datadir}/mfx/samples
 
 %files
 %doc CHANGELOG.md CODEOWNERS README.md
-%license LICENSE 
 %{_bindir}/asg-hevc
 %{_bindir}/hevc_fei_extractor
 
 %files -n %lname
-%{_libdir}/libmfx.so.*
-%{_libdir}/libmfxhw64.so.*
+%license LICENSE 
+%{_libdir}/libmfx.so.%{sover}
+%{_libdir}/libmfx.so.%{sover}.*
+%{_libdir}/libmfxhw64.so.%{sover}
+%{_libdir}/libmfxhw64.so.%{sover}.*
 %dir %{_libdir}/mfx
 %{_libdir}/mfx/libmfx_*_hw64.so
-%dir %{_libdir}/mfx/samples/
-%{_libdir}/mfx/samples/*
-%exclude %{_libdir}/mfx/samples/libvpp_plugin.a
 %dir %{_datadir}/mfx
 %{_datadir}/mfx/plugins.cfg
 
+%files samples
+%{_libdir}/mfx/samples/
+
 %files devel
 %{_includedir}/mfx/
 %{_libdir}/libmfx.so
 %{_libdir}/libmfxhw64.so
 %{_libdir}/pkgconfig/*.pc
-%{_libdir}/mfx/samples/libvpp_plugin.a
 
 %changelog