diff --git a/.gitignore b/.gitignore
index 830fe84..0ccbb87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@
 /criu-3.14.tar.bz2
 /criu-3.15.tar.bz2
 /criu-3.16.tar.bz2
+/criu-3.16.tar.gz
diff --git a/criu.spec b/criu.spec
index 971d431..b625128 100644
--- a/criu.spec
+++ b/criu.spec
@@ -12,13 +12,13 @@
 
 Name: criu
 Version: 3.16
-Release: 1%{?dist}
+Release: 2%{?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: http://download.openvz.org/criu/criu-%{version}.tar.bz2
+Source0: https://github.com/checkpoint-restore/criu/archive/v%{version}/criu-%{version}.tar.gz
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
 BuildRequires: perl
@@ -100,6 +100,14 @@ Requires: %{py_prefix}-%{name} = %{version}-%{release}
 crit is a tool designed to decode CRIU binary dump files and show
 their content in human-readable form.
 
+%package -n criu-ns
+Summary: Tool to run CRIU in different namespaces
+Requires: %{name} = %{version}-%{release}
+
+%description -n criu-ns
+The purpose of the criu-ns wrapper script is to enable restoring a process
+tree that might require a specific PID that is already used on the system.
+This script can help to workaround the so called "PID mismatch" problem.
 
 %prep
 %setup -q
@@ -134,8 +142,7 @@ install -p -m 644  -D %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/crit.1
 install -p -m 644  -D %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man1/compel.1
 %endif
 
-rm -f $RPM_BUILD_ROOT/%{_sbindir}/criu-ns
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/criu-ns.1
+sed -e "s,/usr/bin/env python,%{_bindir}/%{py_binary},g" -i $RPM_BUILD_ROOT/%{_sbindir}/criu-ns
 
 mkdir -p %{buildroot}%{_tmpfilesdir}
 install -m 0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf
@@ -186,8 +193,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a
 %{_bindir}/crit
 %doc %{_mandir}/man1/crit.1*
 
+%files -n criu-ns
+%{_sbindir}/criu-ns
+%doc %{_mandir}/man1/criu-ns.1*
 
 %changelog
+* Thu Sep 23 2021 Adrian Reber <adrian@lisas.de> - 3.16-2
+- Include criu-ns sub package
+- Use new github Source0 location
+
 * Wed Sep 22 2021 Adrian Reber <adrian@lisas.de> - 3.16-1
 - Update to 3.16
 
diff --git a/sources b/sources
index 66d5262..45dfa90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (criu-3.16.tar.bz2) = 75fd0b6614e98ff953709cd01f7b95e64a41a6404cb4fc80df1a6e48e2d255e54e080e542199f785584739d2f89a0982a2ec72263393c5b0f8f98627b84980ed
+SHA512 (criu-3.16.tar.gz) = 3f057332ff7e2199b93b678ae3aba4dfd5cbaba87db333b9b4080651d4b375d708a528ef2f58e8a2c6c4a5267fc24ae722f3636ee4bfb73d6fef22ef2bcabdd1