diff --git a/srcpkgs/criu/patches/capsetget.patch b/srcpkgs/criu/patches/capsetget.patch
new file mode 100644
index 00000000000..48b4cbbd8d6
--- /dev/null
+++ b/srcpkgs/criu/patches/capsetget.patch
@@ -0,0 +1,27 @@
+--- criu/namespaces.c.orig	2016-05-21 11:15:59.401905470 +0200
++++ criu/namespaces.c	2016-05-21 11:17:20.481899402 +0200
+@@ -9,7 +9,7 @@
+ #include <stdarg.h>
+ #include <signal.h>
+ #include <sched.h>
+-#include <sys/capability.h>
++#include <linux/capability.h>
+ 
+ #include "util.h"
+ #include "imgset.h"
+@@ -701,13 +701,13 @@ static int check_user_ns(int pid)
+ 		hdr.version = _LINUX_CAPABILITY_VERSION_3;
+ 		hdr.pid = 0;
+ 
+-		if (capget(&hdr, data) < 0) {
++		if (syscall(SYS_capget, &hdr, data) < 0) {
+ 			pr_perror("capget");
+ 			return -1;
+ 		}
+ 		data[0].effective = data[0].permitted;
+ 		data[1].effective = data[1].permitted;
+-		if (capset(&hdr, data) < 0) {
++		if (syscall(SYS_capset, &hdr, data) < 0) {
+ 			pr_perror("capset");
+ 			return -1;
+ 		}
diff --git a/srcpkgs/criu/patches/fix-glibc-2.23.patch b/srcpkgs/criu/patches/fix-glibc-2.23.patch
deleted file mode 100644
index 6d3dd616ee5..00000000000
--- a/srcpkgs/criu/patches/fix-glibc-2.23.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git include/ptrace.h include/ptrace.h
-index dfc5ecd..efea594 100644
---- include/ptrace.h
-+++ include/ptrace.h
-@@ -44,8 +44,10 @@ struct ptrace_peeksiginfo_args {
- # define PTRACE_SETREGSET      0x4205
- #endif
-
-+#ifndef PTRACE_GETSIGMASK
- #define PTRACE_GETSIGMASK      0x420a
- #define PTRACE_SETSIGMASK      0x420b
-+#endif
-
- #ifndef PTRACE_SECCOMP_GET_FILTER
- #define PTRACE_SECCOMP_GET_FILTER      0x420c
diff --git a/srcpkgs/criu/template b/srcpkgs/criu/template
index b944a1d2510..66e45b5deb7 100644
--- a/srcpkgs/criu/template
+++ b/srcpkgs/criu/template
@@ -1,16 +1,17 @@
 # Template file for 'criu'
 pkgname=criu
-version=1.8
+version=2.2
 revision=1
 hostmakedepends="pkg-config protobuf-c protobuf python asciidoc xmlto"
-makedepends="libbsd-devel protobuf-c-devel protobuf-devel"
+makedepends="libbsd-devel protobuf-c-devel protobuf-devel libnl3-devel"
 depends="python-ipaddr"
 short_desc="Utility to checkpoint/restore a process tree"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="GPL-2, LGPL-2"
 homepage="http://criu.org/"
-distfiles="http://download.openvz.org/criu/criu-$version.tar.bz2"
-checksum=d1d6693d23181b1cd7378d77c142e41bcac3cb2ae5c71ea4c5b7de01f65575bb
+distfiles="https://download.openvz.org/criu/criu-$version.tar.bz2"
+checksum=f893938f72d2c0693a9430e7dd39dc3d32a40187de5edbd65830c6ade0f34e53
+nopie=yes
 
 only_for_archs="x86_64"
 pycompile_module="pycriu"