diff --git a/other/bootstrap_daemon/conf b/other/bootstrap_daemon/conf
index 23580d9d..c05beff1 100644
--- a/other/bootstrap_daemon/conf
+++ b/other/bootstrap_daemon/conf
@@ -6,13 +6,13 @@ port = 33445
 // A key file is like a password, so keep it where no one can read it.
 // The daemon should have permission to read/write to it.
 // Remember to replace the provided example with your own path.
-keys_file_path = "/home/tom/.tox_bootstrap_daemon/keys"
+keys_file_path = "/home/tom/.tox_bootstrap_daemon/.tox_bootstrap_daemon.keys"
 
 // The PID file written to by daemon.
 // Make sure that the user who runs the daemon has permissions to write to the
 // PID file.
 // Remember to replace the provided example with your own path.
-pid_file_path = "/home/tom/.tox_bootstrap_daemon/pid"
+pid_file_path = "/home/tom/.tox_bootstrap_daemon/.tox_bootstrap_daemon.pid"
 
 // Enable IPv6.
 enable_ipv6 = false
diff --git a/other/bootstrap_daemon/tox_bootstrap_daemon.c b/other/bootstrap_daemon/tox_bootstrap_daemon.c
index 66271288..ceb4fded 100644
--- a/other/bootstrap_daemon/tox_bootstrap_daemon.c
+++ b/other/bootstrap_daemon/tox_bootstrap_daemon.c
@@ -53,7 +53,7 @@
 
 
 #define DAEMON_NAME "tox_bootstrap_daemon"
-#define DAEMON_VERSION_NUMBER 2014051700UL // yyyymmmddvv format: yyyy year, mm month, dd day, vv version change count for that day
+#define DAEMON_VERSION_NUMBER 2014051800UL // yyyymmmddvv format: yyyy year, mm month, dd day, vv version change count for that day
 
 #define SLEEP_TIME_MILLISECONDS 30
 #define sleep usleep(1000*SLEEP_TIME_MILLISECONDS)
diff --git a/other/bootstrap_daemon/tox_bootstrap_daemon.sh b/other/bootstrap_daemon/tox_bootstrap_daemon.sh
index e083ea0b..787498ec 100644
--- a/other/bootstrap_daemon/tox_bootstrap_daemon.sh
+++ b/other/bootstrap_daemon/tox_bootstrap_daemon.sh
@@ -18,7 +18,7 @@ USER=tom
 CFG=/home/$USER/.$NAME/conf
 DAEMON=/home/$USER/.$NAME/$NAME
 DAEMON_ARGS="$CFG"
-PIDFILE=/home/$USER/.$NAME/pid
+PIDFILE=/home/$USER/.$NAME/."$NAME".pid
 SCRIPTNAME=/etc/init.d/$NAME
 
 # Exit if the package is not installed