diff --git a/packages/net-proxy/tinyproxy/files/systemd.patch b/packages/net-proxy/tinyproxy/files/systemd.patch
new file mode 100644
index 0000000..6611d1b
--- /dev/null
+++ b/packages/net-proxy/tinyproxy/files/systemd.patch
@@ -0,0 +1,13 @@
+--- a/etc/tinyproxy.conf.in	2010-03-03 10:37:24.000000000 +0100
++++ b/etc/tinyproxy.conf.in	2013-03-09 15:34:41.072135782 +0100
+@@ -123,7 +123,11 @@
+ # can be used for signalling purposes.
+ #
+ #PidFile "@localstatedir@/run/tinyproxy/tinyproxy.pid"
++#
++# systemd wants all pidfiles in /run.
++# Do not change the following line:
++PidFile "/run/tinyproxy/tinyproxy.pid"
+ 
+ #
+ # XTinyproxy: Tell Tinyproxy to include the X-Tinyproxy header, which
diff --git a/packages/net-proxy/tinyproxy/files/user.patch b/packages/net-proxy/tinyproxy/files/user.patch
new file mode 100644
index 0000000..3a6eb34
--- /dev/null
+++ b/packages/net-proxy/tinyproxy/files/user.patch
@@ -0,0 +1,13 @@
+--- a/etc/tinyproxy.conf.in	2010-03-03 10:37:24.000000000 +0100
++++ b/etc/tinyproxy.conf.in	2013-03-09 15:34:41.072135782 +0100
+@@ -12,8 +12,8 @@
+ # as the root user. Either the user or group name or the UID or GID
+ # number may be used.
+ #
+-User nobody
+-Group nobody
++User tinyproxy
++Group tinyproxy
+ 
+ #
+ # Port: Specify the port which tinyproxy will listen on.  Please note
diff --git a/packages/net-proxy/tinyproxy/tinyproxy-1.8.3.exheres-0 b/packages/net-proxy/tinyproxy/tinyproxy-1.8.3.exheres-0
index 2e0a9f3..1fd2fed 100644
--- a/packages/net-proxy/tinyproxy/tinyproxy-1.8.3.exheres-0
+++ b/packages/net-proxy/tinyproxy/tinyproxy-1.8.3.exheres-0
@@ -23,20 +23,8 @@ MYOPTIONS="systemd"
 src_prepare() {
     c="etc/tinyproxy.conf.in"
     b="${c}.bk"
-    if option systemd
-    then
-        sed -e 's,^#PidFile.*,&\
-#\
-# systemd wants all pidfiles in /run.\
-# Do not change the following line:\
-PidFile "/run/tinyproxy/tinyproxy.pid",'
-    else
-        cat
-    fi < "${c}" > "${b}"
-    sed \
-        -e 's/^User nobody/User tinyproxy/' \
-        -e 's/^Group nobody/Group tinyproxy/' \
-        < "${b}" > "${c}"
+    option systemd && expatch "${FILES}/systemd.patch"
+    expatch "${FILES}/user.patch
 }
 
 src_install() {