diff --git a/cherokee/PKGBUILD b/cherokee/PKGBUILD
index bf1f1e3be..7d9ccf1ba 100644
--- a/cherokee/PKGBUILD
+++ b/cherokee/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=cherokee
 pkgver=1.2.101
-pkgrel=3
+pkgrel=4
 pkgdesc="A very fast, flexible and easy to configure Web Server"
 arch=('i686' 'x86_64')
 url="http://www.cherokee-project.com/"
@@ -31,13 +31,13 @@ source=("http://www.cherokee-project.com/download/1.2/${pkgver}/${pkgname}-${pkg
         'cherokee.logrotate'
         'fix-ctk-path-handler-match.patch'
         'gentoo-cherokee-1.2.98-linux3.patch'
-        'gentoo-cherokee-1.2.99-gentoo.patch')
+        'gentoo-cherokee-1.2.99-chakra-customized.patch')
 md5sums=('ef47003355a2e368e4d9596cd070ef23'
-         '83d1d1f58357fedf549ceeaddaacf42e'
+         'aaf900097afba950f0a0a15d906a3648'
          '8d69341bd4002bffd69c6e82ff6c905f'
          '565326a51632bd803671b36b13d02f1d'
          'f8a102f6b4711a2af4ce17e7f59437ae'
-         '5738df659ba069b0eea0d4517e36738b')
+         'e6800e28a2487698a04ad870412f42a9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -47,7 +47,7 @@ build() {
 
   # Apply Gentoo patches
   patch -Np1 -i "${srcdir}/gentoo-cherokee-1.2.98-linux3.patch"
-  patch -Np1 -i "${srcdir}/gentoo-cherokee-1.2.99-gentoo.patch"
+  patch -Np1 -i "${srcdir}/gentoo-cherokee-1.2.99-chakra-customized.patch"
 
   # Use subdirectory for logs
   sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre
diff --git a/cherokee/cherokee.rc b/cherokee/cherokee.rc
index b1b1b58c4..f53b8566a 100755
--- a/cherokee/cherokee.rc
+++ b/cherokee/cherokee.rc
@@ -8,8 +8,8 @@ daemon_name=cherokee
 case "$1" in
   start)
     stat_busy "Starting $daemon_name daemon"
-    if [ ! -f /var/run/$daemon_name.pid ] && $daemon_name -d &>/dev/null; then
-      add_daemon $daemon_name
+    if [ ! -f /var/run/$daemon_name.pid ] && "${daemon_name}" -d &>/dev/null; then
+      add_daemon "${daemon_name}"
       stat_done
     else
       stat_fail
@@ -19,9 +19,9 @@ case "$1" in
 
   stop)
     stat_busy "Stopping $daemon_name daemon"
-    [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid
-    if kill $PID &>/dev/null; then
-      rm_daemon $daemon_name
+    [ -f "/var/run/${daemon_name}.pid" ] && read PID < "/var/run/${daemon_name}.pid"
+    if kill "${PID}" &>/dev/null; then
+      rm_daemon "${daemon_name}"
       stat_done
     else
       stat_fail
@@ -30,10 +30,10 @@ case "$1" in
     ;;
 
   reload)
-    stat_busy "Reloading $daemon_name daemon"
-    [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid
-    if kill -HUP $PID &>/dev/null; then
-      add_daemon $daemon_name
+    stat_busy "Reloading ${daemon_name} daemon"
+    [ -f "/var/run/${daemon_name}.pid" ] && read PID < "/var/run/${daemon_name}.pid"
+    if kill -HUP "${PID}" &>/dev/null; then
+      add_daemon "${daemon_name}"
       stat_done
     else
       stat_fail
@@ -42,10 +42,10 @@ case "$1" in
     ;;
 
   restart)
-    stat_busy "Restarting $daemon_name daemon"
-    [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid
-    if kill -USR1 $PID &>/dev/null; then
-      add_daemon $daemon_name
+    stat_busy "Restarting ${daemon_name} daemon"
+    [ -f "/var/run/${daemon_name}.pid" ] && read PID < "/var/run/${daemon_name}.pid"
+    if kill -USR1 "${PID}" &>/dev/null; then
+      add_daemon "${daemon_name}"
       stat_done
     else
       stat_fail
@@ -55,11 +55,11 @@ case "$1" in
 
   status)
     stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
+    ck_status "${daemon_name}"
     ;;
 
   *)
-    echo "usage: $0 {start|stop|reload|restart|status}"
+    echo "usage: ${0} {start|stop|reload|restart|status}"
 esac
 
 exit 0
diff --git a/cherokee/gentoo-cherokee-1.2.99-gentoo.patch b/cherokee/gentoo-cherokee-1.2.99-chakra-customized.patch
similarity index 55%
rename from cherokee/gentoo-cherokee-1.2.99-gentoo.patch
rename to cherokee/gentoo-cherokee-1.2.99-chakra-customized.patch
index d55a5a2a8..abeb5acf6 100644
--- a/cherokee/gentoo-cherokee-1.2.99-gentoo.patch
+++ b/cherokee/gentoo-cherokee-1.2.99-chakra-customized.patch
@@ -1,6 +1,6 @@
-diff -Naur cherokee-1.2.99.orig/admin/configured.py.pre cherokee-1.2.99/admin/configured.py.pre
---- cherokee-1.2.99.orig/admin/configured.py.pre	2011-03-31 17:30:04.000000000 +0900
-+++ cherokee-1.2.99/admin/configured.py.pre	2011-09-16 19:37:15.893487362 +0900
+diff -Naur a/admin/configured.py.pre b/admin/configured.py.pre
+--- a/admin/configured.py.pre	2012-01-20 00:58:20.098021174 +0000
++++ b/admin/configured.py.pre	2012-01-20 00:58:33.997967915 +0000
 @@ -22,7 +22,7 @@
  CHEROKEE_DATADIR      = join (DATADIR, "cherokee")
  CHEROKEE_DEPSDIR      = join (DATADIR, "cherokee/deps")
@@ -10,19 +10,10 @@ diff -Naur cherokee-1.2.99.orig/admin/configured.py.pre cherokee-1.2.99/admin/co
  CHEROKEE_VAR_RUN      = join (LOCALSTATE, "run")
  CHEROKEE_VAR_LIB      = join (LOCALSTATE, "lib/cherokee")
  CHEROKEE_RRD_DIR      = join (LOCALSTATE, "lib/cherokee/graphs")
-diff -Naur cherokee-1.2.99.orig/cherokee.conf.sample.pre cherokee-1.2.99/cherokee.conf.sample.pre
---- cherokee-1.2.99.orig/cherokee.conf.sample.pre	2011-05-03 18:01:42.000000000 +0900
-+++ cherokee-1.2.99/cherokee.conf.sample.pre	2011-09-16 19:37:15.894487368 +0900
-@@ -18,6 +18,8 @@
- server!server_tokens = full
- server!panic_action = %prefix%/bin/cherokee-panic
- server!pid_file = %localstatedir%/run/cherokee.pid
-+server!user = cherokee
-+server!group = cherokee
- 
- # Default virtual server
- #
-@@ -27,11 +29,11 @@
+diff -Naur a/cherokee.conf.sample.pre b/cherokee.conf.sample.pre
+--- a/cherokee.conf.sample.pre	2012-01-20 00:58:20.064687465 +0000
++++ b/cherokee.conf.sample.pre	2012-01-20 00:58:45.677878184 +0000
+@@ -27,11 +27,11 @@
  
  vserver!1!logger = combined
  vserver!1!logger!access!type = file