diff --git a/common/shlibs b/common/shlibs
index 903bbd16fe4..d11498fe891 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2166,3 +2166,4 @@ libgflags_nothreads.so.2 gflags-2.1.2_1
 libswmhack.so.0.0 spectrwm-2.7.2_1
 libchardet.so.1 libchardet-1.0.4_1
 libcollectdclient.so.1 libcollectdclient-5.5.0_1
+libpinktrace_0.9.so.9 pinktrace-0.9.1_1
diff --git a/srcpkgs/pinktrace-devel b/srcpkgs/pinktrace-devel
new file mode 120000
index 00000000000..fcaab109815
--- /dev/null
+++ b/srcpkgs/pinktrace-devel
@@ -0,0 +1 @@
+pinktrace
\ No newline at end of file
diff --git a/srcpkgs/pinktrace/patches/kernel.patch b/srcpkgs/pinktrace/patches/kernel.patch
new file mode 100644
index 00000000000..36a25afa455
--- /dev/null
+++ b/srcpkgs/pinktrace/patches/kernel.patch
@@ -0,0 +1,11 @@
+--- configure.ac.old	2015-09-19 11:59:18.683048677 +0200
++++ configure.ac	2015-09-19 12:00:18.407968543 +0200
+@@ -109,7 +109,7 @@
+ 	AC_MSG_CHECKING([for supported kernel])
+ 	kernel_version=`uname -r | cut -d'-' -f1`
+ 	case "$kernel_version" in
+-	3.*|2.6*)
++	4.*|3.*|2.6*)
+ 		AC_MSG_RESULT([$kernel_version])
+ 		;;
+ 	2.5*)
diff --git a/srcpkgs/pinktrace/template b/srcpkgs/pinktrace/template
new file mode 100644
index 00000000000..9510c078a99
--- /dev/null
+++ b/srcpkgs/pinktrace/template
@@ -0,0 +1,37 @@
+# Template file for 'pinktrace'
+pkgname=pinktrace
+version=0.9.1
+revision=1
+wrksrc="$pkgname-1-$version"
+build_style=gnu-configure
+configure_args="--enable-python"
+hostmakedepends="automake pkg-config libtool python"
+makedepends="python-devel"
+short_desc="A ptrace() wrapper library"
+maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+license="MIT"
+homepage="http://dev.exherbo.org/~alip/pinktrace/"
+distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
+checksum=04394d69d24fbfb6e7ba42ecfc21e3426359c8d0d7f90d39cc043359b2c74dc8
+
+build_pie=yes
+only_for_archs="x86_64-musl x86_64 i686 i686-musl"
+
+pre_configure() {
+	./autogen.sh
+}
+
+post_install() {
+	vlicense COPYRIGHT
+}
+
+pinktrace-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}