diff --git a/.criu.metadata b/.criu.metadata
index 98f1faf..d64783e 100644
--- a/.criu.metadata
+++ b/.criu.metadata
@@ -1 +1 @@
-b79142b186cfff9e5b43d9d7057fdd88560cbe76 SOURCES/v3.15.tar.gz
+91eb1ccac61a7d538db14884091883c6dab5481a SOURCES/criu-3.15.tar.bz2
diff --git a/.gitignore b/.gitignore
index 5b3bf47..156e6b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/v3.15.tar.gz
+SOURCES/criu-3.15.tar.bz2
diff --git a/SPECS/criu.spec b/SPECS/criu.spec
index f5b6845..da77a98 100644
--- a/SPECS/criu.spec
+++ b/SPECS/criu.spec
@@ -5,19 +5,15 @@
 # parasite code breaks if annobin is enabled.
 %undefine _annotated_build
 
-%global git0 https://github.com/checkpoint-restore/criu/
-%global commit0 f68da4a86fee62af216e9e7520f4916aa29e797b
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-
 Name: criu
 Version: 3.15
-Release: 1%{?dist}
+Release: 3%{?dist}
 Provides: crtools = %{version}-%{release}
 Obsoletes: crtools <= 1.0-2
 Summary: Tool for Checkpoint/Restore in User-space
 License: GPLv2
 URL: http://criu.org/
-Source0: %{git0}/archive/%{commit0}/v%{version}.tar.gz
+Source0: http://download.openvz.org/criu/criu-%{version}.tar.bz2
 Source1: criu-tmpfiles.conf
 BuildRequires: gcc
 BuildRequires: systemd
@@ -26,7 +22,9 @@ BuildRequires: protobuf-devel protobuf-c-devel %{py_prefix}-devel libnl3-devel l
 BuildRequires: asciidoc xmlto
 BuildRequires: perl-interpreter
 BuildRequires: libselinux-devel
-BuildRequires: git
+BuildRequires: gnutls-devel
+BuildRequires: nftables-devel
+BuildRequires: make
 # Checkpointing containers with a tmpfs requires tar
 Recommends: tar
 
@@ -40,6 +38,21 @@ criu is the user-space part of Checkpoint/Restore in User-space
 (CRIU), a project to implement checkpoint/restore functionality for
 Linux in user-space.
 
+%package devel
+Summary: Header files and libraries for %{name}
+Requires: %{name} = %{version}-%{release}
+Requires: criu-libs = %{version}-%{release}
+
+%description devel
+This package contains header files and libraries for %{name}.
+
+%package libs
+Summary: Libraries for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description libs
+This package contains the libraries for %{name}
+
 %package -n %{py_prefix}-%{name}
 %{?python_provide:%python_provide %{py_prefix}-%{name}}
 Summary: Python bindings for %{name}
@@ -58,7 +71,7 @@ crit is a tool designed to decode CRIU binary dump files and show
 their content in human-readable form.
 
 %prep
-%autosetup -Sgit -n %{name}-%{commit0}
+%setup -q
 
 %build
 # %{?_smp_mflags} does not work
@@ -74,21 +87,26 @@ mkdir -p %{buildroot}%{_tmpfilesdir}
 install -m 0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
 install -d -m 0755 %{buildroot}/run/%{name}/
 
-# remove devel and libs packages
-rm -rf $RPM_BUILD_ROOT%{_includedir}/criu
-rm $RPM_BUILD_ROOT%{_libdir}/*.so*
+# remove static libs
 rm $RPM_BUILD_ROOT%{_libdir}/*.a
-rm $RPM_BUILD_ROOT%{_mandir}/man1/compel.1*
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 rm -rf $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 
 %files
 %{_sbindir}/%{name}
 %{_mandir}/man8/criu.8*
+%{_mandir}/man1/compel.1*
 %dir /run/%{name}
 %{_tmpfilesdir}/%{name}.conf
 %doc README.md COPYING
 
+%files devel
+%{_includedir}/criu
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+
+%files libs
+%{_libdir}/*.so.*
+
 %files -n %{py_prefix}-%{name}
 %{python3_sitelib}/pycriu/*
 %{python3_sitelib}/*egg-info
@@ -98,6 +116,15 @@ rm -rf $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 %doc %{_mandir}/man1/crit.1*
 
 %changelog
+* Fri Aug 06 2021 Jindrich Novy <jnovy@redhat.com> - 3.15-3
+- add Requires: criu-libs = %%{version}-%%{release} in criu-devel
+- add gating tests
+- Related: #1934415
+
+* Tue Jul 20 2021 Jindrich Novy <jnovy@redhat.com> - 3.15-2
+- add -devel and -libs subpackages
+- Resolves: #1971718
+
 * Wed Nov 04 2020 Jindrich Novy <jnovy@redhat.com> - 3.15-1
 - update to https://github.com/checkpoint-restore/criu/releases/tag/v3.15
 - Related: #1883490