diff --git a/ircd/ircd.c b/ircd/ircd.c
index 2012ad37..de40944a 100644
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -134,8 +134,8 @@ const char *ircd_paths[IRCD_PATH_COUNT] = {
 	[IRCD_PATH_LIBEXEC] = PKGLIBEXECDIR,
 };
 
-const char *logFileName = LPATH;
-const char *pidFileName = PPATH;
+const char *logFileName = NULL;
+const char *pidFileName = NULL;
 
 void
 ircd_shutdown(const char *reason)
@@ -581,6 +581,9 @@ charybdis_main(int argc, char *argv[])
 
 	init_sys();
 
+	logFileName = ircd_paths[IRCD_PATH_IRCD_LOG];
+	pidFileName = ircd_paths[IRCD_PATH_IRCD_PID];
+
 	ConfigFileEntry.dpath = ircd_paths[IRCD_PATH_PREFIX];
 	ConfigFileEntry.configfile = ircd_paths[IRCD_PATH_IRCD_CONF];	/* Server configuration file */
 	ConfigFileEntry.connect_timeout = 30;	/* Default to 30 */