diff --git a/srcpkgs/cherokee/cherokee-devel.template b/srcpkgs/cherokee/cherokee-devel.template
index 542520f143..e174c2bdad 100644
--- a/srcpkgs/cherokee/cherokee-devel.template
+++ b/srcpkgs/cherokee/cherokee-devel.template
@@ -5,11 +5,13 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
 Add_dependency run libcherokee
 
-do_install()
-{
+do_install() {
+	vmove usr/bin/cherokee-config usr/bin
         vmove usr/include usr
         vmove usr/lib/pkgconfig usr/lib
-		vmove usr/share/aclocal usr/share
+	vmove usr/share/aclocal usr/share
 }
diff --git a/srcpkgs/cherokee/files/cherokee.tmpfiles.d b/srcpkgs/cherokee/files/cherokee.tmpfiles.d
new file mode 100644
index 0000000000..9b08317799
--- /dev/null
+++ b/srcpkgs/cherokee/files/cherokee.tmpfiles.d
@@ -0,0 +1,3 @@
+d	/etc/cherokee/ssl		0755	httpd	httpd	-
+d	/var/log/cherokee		0755	httpd	httpd	-
+d	/var/lib/cherokee/graphs/images	0755	httpd	httpd	-
diff --git a/srcpkgs/cherokee/libcherokee.rshlibs b/srcpkgs/cherokee/libcherokee.rshlibs
index 14060d2720..bae2612c58 100644
--- a/srcpkgs/cherokee/libcherokee.rshlibs
+++ b/srcpkgs/cherokee/libcherokee.rshlibs
@@ -15,3 +15,4 @@ libnsl.so.1
 libssl.so.1
 libpam.so.0
 libldap-2.4.so.2
+libpcre.so.0
diff --git a/srcpkgs/cherokee/libcherokee.template b/srcpkgs/cherokee/libcherokee.template
index 9ca942463f..5b0ef08c4d 100644
--- a/srcpkgs/cherokee/libcherokee.template
+++ b/srcpkgs/cherokee/libcherokee.template
@@ -1,5 +1,6 @@
 # Template file for 'libcherokee'.
 #
+revision=1
 short_desc="${short_desc} (Runtime library)"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/cherokee/template b/srcpkgs/cherokee/template
index 049da82f20..eef5f4f3e0 100644
--- a/srcpkgs/cherokee/template
+++ b/srcpkgs/cherokee/template
@@ -1,13 +1,13 @@
 # Template file for 'cherokee'
 pkgname=cherokee
 version=1.2.101
+revision=1
 distfiles="http://www.${pkgname}-project.com/download/1.2/${version}/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
 configure_args="--prefix=/usr --sysconfdir=/etc --localstatedir=/var
 --disable-static --with-wwwroot=/srv/httpd --with-wwwuser=httpd
---with-wwwgroup=httpd --with-python=python
---enable-os-string=Linux"
-short_desc="An innovative, feature rich, and yet easy to configure open source Web Server."
+--with-wwwgroup=httpd --with-python=python --enable-os-string=Linux"
+short_desc="An innovative, feature rich, and yet easy to configure open source Web Server"
 maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.cherokee-project.com/"
 license="GPL-2"
@@ -24,42 +24,35 @@ long_desc="
 
 subpackages="${pkgname}-devel lib${pkgname}"
 
-conf_files="
-/etc/cherokee/cherokee.conf"
-
+conf_files="/etc/${pkgname}/${pkgname}.conf"
 systemd_services="cherokee.service on"
 
-make_dirs="
-/etc/cherokee/ssl 0755 httpd httpd
-/var/log/cherokee 0755 httpd httpd
-/var/lib/cherokee/graphs/images 0755 httpd httpd"
-
 system_accounts="httpd"
 httpd_descr="Cherokee HTTP server"
 httpd_homedir="/srv/httpd"
 
 Add_dependency build coreutils
 Add_dependency build gettext
+Add_dependency build pcre-devel
+Add_dependency build python-devel
 Add_dependency build libldap-devel
 Add_dependency build pam-devel
 Add_dependency build libmysqlclient-devel
 Add_dependency build ffmpeg-devel
 Add_dependency build geoip-devel
 
-Add_dependency full python
-
-pre_configure()
-{
+pre_configure() {
 	# use /var/log/cherokee instead of /var/log
-	sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre
-	
+	sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' \
+		cherokee.conf.sample.pre
 }
 
-post_install()
-{
+post_install() {
 	# Setup logrotate thing
 	vinstall ${FILESDIR}/${pkgname}.logrotate 644 etc/logrotate.d ${pkgname}
 	
 	# Install systemd service
 	vinstall ${FILESDIR}/${pkgname}.service 644 lib/systemd/system
+	vinstall ${FILESDIR}/${pkgname}.tmpfiles.d 644 \
+		usr/lib/tmpfiles.d ${pkgname}.conf
 }