diff --git a/base/s6/s6.conf b/base/s6/s6.conf
index 0a39b3200..18a4e5bc2 100644
--- a/base/s6/s6.conf
+++ b/base/s6/s6.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../s6/s6.conf
-# Copyright (C) 2011 - 2013 The OpenSDE Project
+# Copyright (C) 2011 - 2015 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -13,26 +13,8 @@
 # --- SDE-COPYRIGHT-NOTE-END ---
 
 if [ "$prefix_auto" = 1 ]; then
-        prefix="usr"
+        prefix=
         set_confopt
 fi
 
-# execline is following slashpackage confentions
-srcdir=admin/$pkg-$ver
-
-s6_conf() {
-	pkgprefix -t execline
-	echo "$( pkgprefix -r libdir execline )" >> conf-compile/path-library
-	echo "$( pkgprefix -r libdir execline )" >> conf-compile/path-library.so
-	echo "$( pkgprefix -r includedir execline )" >> conf-compile/path-include
-}
-hook_add preconf 9 's6_conf'
-
-# install missing files
-s6_install_missing() {
-	# TODO check why the following stuff is not installed
-	install -m 0755 command/s6-ftrigrd $root/$bindir
-	cp -avp include/* $root$includedir
-	cp -avp doc/* $root$docdir
-}
-hook_add postmake 9 's6_install_missing'
+var_append confopt ' ' '--libexecdir=$bindir'
diff --git a/base/s6/s6.desc b/base/s6/s6.desc
index 5a0b2f254..1f5a42778 100644
--- a/base/s6/s6.desc
+++ b/base/s6/s6.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../s6/s6.desc
-[COPY] Copyright (C) 2011 - 2013 The OpenSDE Project
+[COPY] Copyright (C) 2011 - 2015 The OpenSDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
 [COPY]
@@ -28,9 +28,9 @@
 
 [L] ISC
 [S] Stable
-[V] 1.0.0
+[V] 2.2.0.1
 [P] X -?---5---9 108.900
 
 [O] . $base/package/*/*/skaware-conf.in
 
-[D] 2465432092 s6-1.0.0.tar.gz http://www.skarnet.org/software/s6/
+[D] 1380790935 s6-2.2.0.1.tar.gz http://www.skarnet.org/software/s6/