diff --git a/home/config.go b/home/config.go
index 41071c61..66f51ea7 100644
--- a/home/config.go
+++ b/home/config.go
@@ -49,6 +49,7 @@ type configuration struct {
 	ourConfigFilename string // Config filename (can be overridden via the command line arguments)
 	ourWorkingDir     string // Location of our directory, used to protect against CWD being somewhere else
 	firstRun          bool   // if set to true, don't run any services except HTTP web inteface, and serve only first-run html
+	pidFileName       string // PID file name.  Empty if no PID file was created.
 	// runningAsService flag is set to true when options are passed from the service runner
 	runningAsService bool
 	disableUpdate    bool // If set, don't check for updates
diff --git a/home/home.go b/home/home.go
index fdcdf4cc..00b11c4b 100644
--- a/home/home.go
+++ b/home/home.go
@@ -32,7 +32,6 @@ var httpsServer struct {
 	sync.Mutex            // protects config.TLS
 	shutdown   bool       // if TRUE, don't restart the server
 }
-var pidFileName string // PID file name.  Empty if no PID file was created.
 
 const (
 	// Used in config to indicate that syslog or eventlog (win) should be used for logger output
@@ -169,7 +168,7 @@ func run(args options) {
 	}
 
 	if len(args.pidFile) != 0 && writePIDFile(args.pidFile) {
-		pidFileName = args.pidFile
+		config.pidFileName = args.pidFile
 	}
 
 	// Update filters we've just loaded right away, don't wait for periodic update timer
@@ -409,8 +408,8 @@ func stopHTTPServer() {
 
 // This function is called before application exits
 func cleanupAlways() {
-	if len(pidFileName) != 0 {
-		os.Remove(pidFileName)
+	if len(config.pidFileName) != 0 {
+		os.Remove(config.pidFileName)
 	}
 	log.Info("Stopped")
 }