diff --git a/common/shlibs b/common/shlibs
index ff933b8b3d..1fcfc0a434 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1990,3 +1990,4 @@ libcvm-udp.so.1 cvm-0.97_1
 libcvm-v1client.so.1 cvm-0.97_1
 libcvm-v2client.so.1 cvm-0.97_1
 libudns.so.0 udns-0.4_1
+libcriu.so.1 criu-1.5.1_2
diff --git a/srcpkgs/criu-devel b/srcpkgs/criu-devel
new file mode 120000
index 0000000000..33c504fed3
--- /dev/null
+++ b/srcpkgs/criu-devel
@@ -0,0 +1 @@
+criu
\ No newline at end of file
diff --git a/srcpkgs/criu/template b/srcpkgs/criu/template
index 9889c948b5..79e96c4c0d 100644
--- a/srcpkgs/criu/template
+++ b/srcpkgs/criu/template
@@ -1,7 +1,7 @@
 # Template file for 'criu'
 pkgname=criu
 version=1.5.1
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="pkg-config protobuf-c protobuf python asciidoc xmlto"
 makedepends="libbsd-devel protobuf-c-devel protobuf-devel"
@@ -12,10 +12,21 @@ license="GPL-2, LGPL-2"
 homepage="http://criu.org/"
 distfiles="http://download.openvz.org/criu/criu-$version.tar.bz2"
 checksum=0bf47f02e32ac7d81bb953ba6ecd0b8dd748728042afed36f31852a59042a8d2
-make_install_args="LIBDIR=/usr/lib SBINDIR=/usr/bin BINDIR=/usr/bin"
 only_for_archs="x86_64"
+pycompile_module="pycriu"
 
-post_install() {
-	mv $DESTDIR/bin/* $DESTDIR/usr/bin
-	mv $DESTDIR/lib/* $DESTDIR/usr/lib
+do_install() {
+	make DESTDIR=${DESTDIR} PREFIX=/usr LIBDIR=/usr/lib SBINDIR=/usr/bin install
+	mv ${DESTDIR}/bin/* ${DESTDIR}/usr/bin
+	mv ${DESTDIR}/lib/* ${DESTDIR}/usr/lib
+}
+
+criu-devel_package() {
+	short_desc+=" - development files"
+	depends="criu-${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
+	}
 }