diff --git a/srcpkgs/s6-devel b/srcpkgs/s6-devel
new file mode 120000
index 00000000000..7b7dd69c186
--- /dev/null
+++ b/srcpkgs/s6-devel
@@ -0,0 +1 @@
+s6
\ No newline at end of file
diff --git a/srcpkgs/s6-doc b/srcpkgs/s6-doc
new file mode 120000
index 00000000000..7b7dd69c186
--- /dev/null
+++ b/srcpkgs/s6-doc
@@ -0,0 +1 @@
+s6
\ No newline at end of file
diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template
new file mode 100644
index 00000000000..8e548eb1005
--- /dev/null
+++ b/srcpkgs/s6/template
@@ -0,0 +1,36 @@
+# Template file for 's6'
+pkgname=s6
+version=2.2.1.0
+revision=1
+build_pie=yes
+build_style=gnu-configure
+makedepends="execline-devel skalibs-devel"
+configure_args="--libdir=/usr/lib"
+short_desc="Small suite of programs for UNIX, designed to allow process supervision"
+maintainer="Juan RP <xtraeme@voidlinux.eu>"
+license="ISC"
+homepage="http://skarnet.org/software/s6/"
+distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz"
+checksum=87ef4bd483aa77370c1bd946815a72d8d56290214e3e229e3c79c2e9240ac073
+
+post_install() {
+	vlicense COPYING
+	vdoc README
+	vcopy "doc/*" usr/share/doc/${pkgname}
+}
+
+s6-doc_package() {
+	noarch=yes
+	short_desc="s6 supervision documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
+s6-devel_package() {
+	short_desc="s6 supervision library and headers"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.a
+	}
+}