--- fetchmail.in	Sun May 14 20:05:45 2006
+++ fetchmail.in	Sun May 14 20:06:39 2006
@@ -52,7 +52,7 @@ 
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/bin/${name}
-pidfile=/var/run/${name}.pid
+pidfile=/var/run/${name}/${name}.pid
 extra_commands="awaken"
 awaken_cmd="fetchmail_awaken"
 
@@ -89,6 +89,8 @@ 
 		else
 			eval fetchmail_user=fetchmail
 			eval pidfile=/var/run/fetchmail/fetchmail.pid
+			mkdir -p /var/run/fetchmail
+			chown $fetchmail_user /var/run/fetchmail
 		fi
 		required_files=${fetchmail_config}
 		eval fetchmail_polling_interval="\${fetchmail_${user}_polling_interval:-${fetchmail_polling_interval}}"