diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/etc-default-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/etc-default-template
index d79474746..e411aabdc 100644
--- a/src/main/resources/com/typesafe/sbt/packager/archetypes/etc-default-template
+++ b/src/main/resources/com/typesafe/sbt/packager/archetypes/etc-default-template
@@ -25,7 +25,7 @@
 # -Dkey=val
 
 # For play applications you may set
-# -Dpidfile.path=/var/run/${{app_name}}.pid
+# -Dpidfile.path=/var/run/${{app_name}}/play.pid
 
 # Turn on JVM debugging, open at the given port
 # -jvm-debug <port>  
diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/systemv/start-debian-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/systemv/start-debian-template
index 40f2bc7ef..8a42ab7a3 100644
--- a/src/main/resources/com/typesafe/sbt/packager/archetypes/systemv/start-debian-template
+++ b/src/main/resources/com/typesafe/sbt/packager/archetypes/systemv/start-debian-template
@@ -13,14 +13,13 @@ source /lib/init/vars.sh
 source /lib/lsb/init-functions
 
 
-PIDFILE=/var/run/${{app_name}}.pid
+PIDFILE=/var/run/${{app_name}}/running.pid
 
 if [ -z "$DAEMON_USER" ]; then
     DAEMON_USER=${{daemon_user}}
 fi
 
 
-# smb could define some additional options in $RUN_OPTS
 RUN_CMD="${{chdir}}/bin/${{app_name}}"