diff --git a/.gitignore b/.gitignore
index b4ba520..39889f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qatlib-21.11.0.tar.gz
+/qatlib-22.07.0.tar.gz
diff --git a/qatlib.spec b/qatlib.spec
index 086e912..124f5e7 100644
--- a/qatlib.spec
+++ b/qatlib.spec
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: MIT
 
-%global libqat_soversion  2
+%global libqat_soversion  3
 %global libusdm_soversion 0
 Name:             qatlib
-Version:          21.11.0
+Version:          22.07.0
 Release:          1%{?dist}
 Summary:          Intel QuickAssist user space library
 # The entire source code is released under BSD.
@@ -11,13 +11,12 @@ Summary:          Intel QuickAssist user space library
 License:          BSD and (BSD or GPLv2)
 URL:              https://github.com/intel/%{name}
 Source0:          https://github.com/intel/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
-BuildRequires:    systemd gcc make autoconf automake libtool systemd-devel openssl-devel zlib-devel
+BuildRequires:    systemd gcc make autoconf automake libtool systemd-devel openssl-devel zlib-devel yasm
 Requires(pre):    shadow-utils
+Recommends:       qatlib-service
 # https://bugzilla.redhat.com/show_bug.cgi?id=1897661
 ExcludeArch:      %{arm} aarch64 %{power64} s390x i686
 
-%{?systemd_requires}
-
 %description
 Intel QuickAssist Technology (Intel QAT) provides hardware acceleration
 for offloading security, authentication and compression services from the
@@ -46,6 +45,15 @@ Requires:      %{name}%{?_isa} = %{version}-%{release}
 %description   tests
 This package contains sample applications that use the Intel QuickAssists APIs.
 
+%package       service
+Summary:       A daemon for qatlib resources management
+Requires:      %{name}%{?_isa} = %{version}-%{release}
+%{?systemd_requires}
+
+%description   service
+This package contains a daemon that manages QAT resources for the Intel
+QuickAssist Technology user space library (qatlib).
+
 %prep
 %autosetup
 
@@ -62,18 +70,20 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 make DESTDIR=%{buildroot} samples-install
 rm %{buildroot}/%{_libdir}/libqat.la
 rm %{buildroot}/%{_libdir}/libusdm.la
+rm %{buildroot}/%{_libdir}/libqat.a
+rm %{buildroot}/%{_libdir}/libusdm.a
 
 %pre
 getent group qat >/dev/null || groupadd -r qat
 exit 0
 
-%post
+%post          service
 %systemd_post qat.service
 
-%preun
+%preun         service
 %systemd_preun qat.service
 
-%postun
+%postun        service
 %systemd_postun_with_restart qat.service
 
 %files
@@ -81,11 +91,6 @@ exit 0
 %license LICENSE*
 %{_libdir}/libqat.so.%{libqat_soversion}*
 %{_libdir}/libusdm.so.%{libusdm_soversion}*
-%{_sbindir}/qatmgr
-%{_sbindir}/qat_init.sh
-%{_unitdir}/qat.service
-%{_mandir}/man8/qat_init.sh.8*
-%{_mandir}/man8/qatmgr.8*
 
 %files         devel
 %{_libdir}/libqat.so
@@ -93,6 +98,7 @@ exit 0
 %{_includedir}/qat
 
 %files         tests
+%doc quickassist/lookaside/access_layer/src/sample_code/README.txt
 %attr(0754,-,qat) %{_bindir}/cpa_sample_code
 %attr(0754,-,qat) %{_bindir}/dc_dp_sample
 %attr(0754,-,qat) %{_bindir}/dc_stateless_sample
@@ -115,7 +121,18 @@ exit 0
 %{_datadir}/qat/calgary32
 %{_datadir}/qat/canterbury
 
+%files         service
+%{_sbindir}/qatmgr
+%{_sbindir}/qat_init.sh
+%{_unitdir}/qat.service
+%{_mandir}/man8/qatmgr.8*
+%{_mandir}/man8/qat_init.sh.8*
+
 %changelog
+* Fri Jul 22 2022 Vladis Dronov <vdronov@redhat.com> - 22.07.0-1
+- Update to qatlib 22.07 (bz 2040743)
+- Moved qat.service to separate rpm
+
 * Thu Nov 11 2021 Vladis Dronov <vdronov@redhat.com> - 21.11.0-1
 - Update to qatlib 21.11 (bz 1960303)
 - Add qatlib-tests package
diff --git a/sources b/sources
index ae0d9aa..3b6c27c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qatlib-21.11.0.tar.gz) = 740fa282ee540ba74e14ed07b4c79d3af239809c2b6216361b23ccc4787ee378a7a7c336c71087d4a1a59da22db7d5cdef7290ceb7f8e879feaf70f766119dfb
+SHA512 (qatlib-22.07.0.tar.gz) = 66d7bb66070eaaa11d47637bb56dce1108ab72f66736f82af207c82bd2c552be80d24fcfb840c2cb41df57142559ab4c502fc4365f56db0c3aa994264d5105fa