diff --git a/src/ircd.c b/src/ircd.c
index 4aeb6c63..bd293212 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -585,6 +585,10 @@ main(int argc, char *argv[])
 	if(!testing_conf)
 	{
 		check_pidfile(pidFileName);
+
+		if(!server_state_foreground)
+			make_daemon();
+
 		inotice("starting %s ...", ircd_version);
 		inotice("%s", rb_lib_version());
 	}
@@ -702,6 +706,7 @@ main(int argc, char *argv[])
 	construct_umodebuf();
 
 	check_class();
+	write_pidfile(pidFileName);
 	load_help();
 	open_logfiles();
 
@@ -723,10 +728,6 @@ main(int argc, char *argv[])
 	if(server_state_foreground)
 		inotice("now running in foreground mode from %s as pid %d ...",
 		        ConfigFileEntry.dpath, getpid());
-	else
-		make_daemon();
-
-	write_pidfile(pidFileName);
 
 	rb_lib_loop(0);