diff --git a/Dockerfile b/Dockerfile
index b5fb487..d2fbfcc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,4 +24,4 @@ RUN wget http://ftp.de.debian.org/debian/pool/main/g/gcc-4.9/libstdc++6_4.9.2-10
 WORKDIR /usr/lib/plexmediaserver
 
 ENTRYPOINT ["/sbin/tini", "--"]
-CMD ["su-exec", "$UID:$GID", "start_pms"]
+CMD exec su-exec $UID:$GID start_pms
diff --git a/start_pms.patch b/start_pms.patch
index 7c73096..adc7fda 100644
--- a/start_pms.patch
+++ b/start_pms.patch
@@ -1,6 +1,6 @@
---- plexmediaserver/usr/sbin/start_pms
-+++ start_pms
-@@ -1,17 +1,11 @@
+--- start_pms
++++ /usr/bin/start_pms
+@@ -1,17 +1,12 @@
  #!/bin/sh
 
 -#change these parameters in /etc/default/plexmediaserver
@@ -21,16 +21,17 @@
 +export PLEX_MEDIA_SERVER_MAX_STACK_SIZE="${PLEX_MEDIA_SERVER_MAX_STACK_SIZE:-3000}"
 +export PLEX_MEDIA_SERVER_TMPDIR="${PLEX_MEDIA_SERVER_TMPDIR:-/tmp}"
 +export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR:-/config}"
++export PLEX_MEDIA_SERVER_CONFIG_DIR="${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}/Plex Media Server"
 
  if [ ! -d "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR" ]
  then
-@@ -22,15 +16,17 @@
+@@ -22,15 +17,18 @@
      exit 1
    fi
  fi
-+if [ ! -w "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR" ]
++if [ ! -w "$PLEX_MEDIA_SERVER_CONFIG_DIR" ]
 +then
-+  echo "ERROR: CANNOT WRITE IN $PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR, MAKE SURE I HAVE PERMISSION TO DO THAT!"
++  echo "ERROR: CANNOT WRITE IN $PLEX_MEDIA_SERVER_CONFIG_DIR, MAKE SURE I HAVE PERMISSION TO DO THAT!"
 +  exit 2
 +fi
 
@@ -44,8 +45,9 @@
 -
 -# Add sleep - Possible fix for start on boot.
 -sleep 3
-+if [ -f /config/Plex\ Media\ Server/plexmediaserver.pid ]; then
-+    rm -f /config/Plex\ Media\ Server/plexmediaserver.pid
++PIDFILE="${PLEX_MEDIA_SERVER_CONFIG_DIR}/plexmediaserver.pid"
++if [ -f "$PIDFILE" ]; then
++    rm -f "$PIDFILE"
 +fi
 
 -(cd /usr/lib/plexmediaserver; ./Plex\ Media\ Server)