diff --git a/extensions/m_identify.c b/extensions/m_identify.c
index ece59522..ea4b75a8 100644
--- a/extensions/m_identify.c
+++ b/extensions/m_identify.c
@@ -38,7 +38,7 @@
 #include "irc_string.h"
 #include "numeric.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "send.h"
 #include "msg.h"
diff --git a/extensions/m_mkpasswd.c b/extensions/m_mkpasswd.c
index 35a9c0ce..804ae211 100644
--- a/extensions/m_mkpasswd.c
+++ b/extensions/m_mkpasswd.c
@@ -18,7 +18,7 @@
 #include "numeric.h"
 #include "s_newconf.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "send.h"
 #include "msg.h"
diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c
index 10967532..53ed832f 100644
--- a/extensions/m_ojoin.c
+++ b/extensions/m_ojoin.c
@@ -24,7 +24,7 @@
 #include "client.h" 
 #include "ircd.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "s_newconf.h" 
diff --git a/extensions/m_olist.c b/extensions/m_olist.c
index a402f8b8..5a51ccfe 100644
--- a/extensions/m_olist.c
+++ b/extensions/m_olist.c
@@ -31,7 +31,7 @@
 #include "client.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "send.h"
 #include "whowas.h"
diff --git a/extensions/m_opme.c b/extensions/m_opme.c
index 5139373b..f75f1655 100644
--- a/extensions/m_opme.c
+++ b/extensions/m_opme.c
@@ -23,7 +23,7 @@
 #include "client.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "send.h"
 #include "whowas.h"
diff --git a/include/ircd_defs.h b/include/ircd_defs.h
index f5c359f6..f9fb55dc 100644
--- a/include/ircd_defs.h
+++ b/include/ircd_defs.h
@@ -59,7 +59,7 @@
 #define IRC_DEPRECATED
 #endif
 
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
 
 #ifdef SOFT_ASSERT
diff --git a/include/s_log.h b/include/logger.h
similarity index 100%
rename from include/s_log.h
rename to include/logger.h
diff --git a/modules/core/m_die.c b/modules/core/m_die.c
index ec81e79c..624fbc64 100644
--- a/modules/core/m_die.c
+++ b/modules/core/m_die.c
@@ -29,7 +29,7 @@
 #include "ircd.h"
 #include "irc_string.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_conf.h"
 #include "send.h"
 #include "msg.h"
diff --git a/modules/core/m_error.c b/modules/core/m_error.c
index 96d15dc0..0c194b14 100644
--- a/modules/core/m_error.c
+++ b/modules/core/m_error.c
@@ -32,7 +32,7 @@
 #include "send.h"
 #include "msg.h"
 #include "modules.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_conf.h"
 
 static int m_error(struct Client *, struct Client *, int, const char **);
diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
index 525f37c9..5559dacb 100644
--- a/modules/core/m_kill.c
+++ b/modules/core/m_kill.c
@@ -30,7 +30,7 @@
 #include "ircd.h"
 #include "numeric.h"
 #include "sprintf_irc.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "send.h"
diff --git a/modules/core/m_mode.c b/modules/core/m_mode.c
index b2ab73cd..72f547a9 100644
--- a/modules/core/m_mode.c
+++ b/modules/core/m_mode.c
@@ -34,7 +34,7 @@
 #include "s_user.h"
 #include "s_conf.h"
 #include "s_serv.h"
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
 #include "msg.h"
 #include "parse.h"
diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index 02c27878..aa68ea05 100644
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -38,7 +38,7 @@
 #include "s_serv.h"
 #include "send.h"
 #include "channel.h"
-#include "s_log.h"
+#include "logger.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index 29512ec7..4608bdbf 100644
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -33,7 +33,7 @@
 #include "numeric.h"		/* ERR_xxx */
 #include "s_conf.h"		/* struct ConfItem */
 #include "s_newconf.h"
-#include "s_log.h"		/* log level defines */
+#include "logger.h"		/* log level defines */
 #include "s_serv.h"		/* server_estab, check_server */
 #include "s_stats.h"		/* ServerStats */
 #include "scache.h"
diff --git a/modules/core/m_squit.c b/modules/core/m_squit.c
index 9963f681..67e939e9 100644
--- a/modules/core/m_squit.c
+++ b/modules/core/m_squit.c
@@ -31,7 +31,7 @@
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "send.h"
 #include "msg.h"
diff --git a/modules/m_challenge.c b/modules/m_challenge.c
index 9c270115..084f6268 100644
--- a/modules/m_challenge.c
+++ b/modules/m_challenge.c
@@ -45,7 +45,7 @@
 #include "msg.h"
 #include "parse.h"
 #include "irc_string.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_user.h"
 #include "cache.h"
 #include "s_newconf.h"
diff --git a/modules/m_connect.c b/modules/m_connect.c
index 22fb7f21..6bca0a17 100644
--- a/modules/m_connect.c
+++ b/modules/m_connect.c
@@ -31,7 +31,7 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "send.h"
 #include "msg.h"
diff --git a/modules/m_dline.c b/modules/m_dline.c
index 32cc408c..1880362e 100644
--- a/modules/m_dline.c
+++ b/modules/m_dline.c
@@ -36,7 +36,7 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
 #include "hash.h"
 #include "s_serv.h"
diff --git a/modules/m_gline.c b/modules/m_gline.c
index 8301c87a..322e2d84 100644
--- a/modules/m_gline.c
+++ b/modules/m_gline.c
@@ -44,7 +44,7 @@
 #include "hash.h"
 #include "parse.h"
 #include "modules.h"
-#include "s_log.h"
+#include "logger.h"
 #include "reject.h"
 
 static int mo_gline(struct Client *, struct Client *, int, const char **);
diff --git a/modules/m_help.c b/modules/m_help.c
index 56d4b835..ae5b90e9 100644
--- a/modules/m_help.c
+++ b/modules/m_help.c
@@ -31,7 +31,7 @@
 #include "numeric.h"
 #include "send.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "parse.h"
 #include "modules.h"
 #include "hash.h"
diff --git a/modules/m_kline.c b/modules/m_kline.c
index 29fba0d6..c9b21ae4 100644
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -36,7 +36,7 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
 #include "hash.h"
 #include "s_serv.h"
diff --git a/modules/m_oper.c b/modules/m_oper.c
index 61da90ce..886da7cc 100644
--- a/modules/m_oper.c
+++ b/modules/m_oper.c
@@ -32,7 +32,7 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_user.h"
 #include "send.h"
 #include "msg.h"
diff --git a/modules/m_rehash.c b/modules/m_rehash.c
index 8e8771ce..672e5b7b 100644
--- a/modules/m_rehash.c
+++ b/modules/m_rehash.c
@@ -36,7 +36,7 @@
 #include "res.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
 #include "msg.h"
 #include "parse.h"
diff --git a/modules/m_restart.c b/modules/m_restart.c
index 9dfae770..365eb343 100644
--- a/modules/m_restart.c
+++ b/modules/m_restart.c
@@ -34,7 +34,7 @@
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "restart.h"
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
 #include "msg.h"
 #include "parse.h"
diff --git a/modules/m_resv.c b/modules/m_resv.c
index 084f3f8e..9d46750c 100644
--- a/modules/m_resv.c
+++ b/modules/m_resv.c
@@ -36,7 +36,7 @@
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "hash.h"
-#include "s_log.h"
+#include "logger.h"
 #include "sprintf_irc.h"
 
 static int mo_resv(struct Client *, struct Client *, int, const char **);
diff --git a/modules/m_svinfo.c b/modules/m_svinfo.c
index 0d8d90ce..d7336eb5 100644
--- a/modules/m_svinfo.c
+++ b/modules/m_svinfo.c
@@ -31,7 +31,7 @@
 #include "numeric.h"
 #include "send.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
diff --git a/modules/m_testmask.c b/modules/m_testmask.c
index 97f78895..c586e3f9 100644
--- a/modules/m_testmask.c
+++ b/modules/m_testmask.c
@@ -41,7 +41,7 @@
 #include "irc_string.h"
 #include "numeric.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "send.h"
 #include "msg.h"
diff --git a/modules/m_who.c b/modules/m_who.c
index 882a11a5..7ab77533 100644
--- a/modules/m_who.c
+++ b/modules/m_who.c
@@ -35,7 +35,7 @@
 #include "irc_string.h"
 #include "sprintf_irc.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
diff --git a/modules/m_whois.c b/modules/m_whois.c
index 044493b5..516863e5 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -38,7 +38,7 @@
 #include "irc_string.h"
 #include "sprintf_irc.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
diff --git a/modules/m_xline.c b/modules/m_xline.c
index 884a71d1..fb615ad0 100644
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -39,7 +39,7 @@
 #include "class.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "whowas.h"
 #include "irc_string.h"
diff --git a/src/Makefile.in b/src/Makefile.in
index ef6a88e9..6f5f1b64 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -72,6 +72,7 @@ SRCS =                          \
   ircd_state.c			\
   kdparse.c			\
   listener.c                    \
+  logger.c                      \
   match.c                       \
   modules.c                     \
   monitor.c			\
@@ -87,7 +88,6 @@ SRCS =                          \
   s_conf.c                      \
   s_newconf.c			\
   s_gline.c                     \
-  s_log.c                       \
   s_serv.c                      \
   s_stats.c                     \
   s_user.c                      \
diff --git a/src/channel.c b/src/channel.c
index e372a2f9..d1acd20b 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -40,7 +40,7 @@
 #include "whowas.h"
 #include "s_conf.h"		/* ConfigFileEntry, ConfigChannel */
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 
 extern rb_dlink_list global_channel_list;
 
diff --git a/src/chmode.c b/src/chmode.c
index 2e73cb95..6598eacf 100644
--- a/src/chmode.c
+++ b/src/chmode.c
@@ -41,7 +41,7 @@
 #include "whowas.h"
 #include "s_conf.h"		/* ConfigFileEntry, ConfigChannel */
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 
 /* bitmasks for error returns, so we send once per call */
 #define SM_ERR_NOTS             0x00000001	/* No TS on channel */
diff --git a/src/client.c b/src/client.c
index 7b2b5a02..a34b9e88 100644
--- a/src/client.c
+++ b/src/client.c
@@ -40,7 +40,7 @@
 #include "s_auth.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "s_stats.h"
 #include "send.h"
diff --git a/src/ircd.c b/src/ircd.c
index 7822ed5d..c8a466e9 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -46,7 +46,7 @@
 #include "restart.h"
 #include "s_auth.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"		/* try_connections */
 #include "s_user.h"
 #include "s_stats.h"
diff --git a/src/ircd_signal.c b/src/ircd_signal.c
index 906e4a47..bbbe64b6 100644
--- a/src/ircd_signal.c
+++ b/src/ircd_signal.c
@@ -24,7 +24,7 @@
 #include "ircd_signal.h"
 #include "ircd.h"		/* dorehash */
 #include "restart.h"		/* server_reboot */
-#include "s_log.h"
+#include "logger.h"
 #include "s_conf.h"
 #include "client.h"
 #include "send.h"
diff --git a/src/ircd_state.c b/src/ircd_state.c
index bac6497c..387ba250 100644
--- a/src/ircd_state.c
+++ b/src/ircd_state.c
@@ -56,7 +56,7 @@
 #include "restart.h"
 #include "s_auth.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"             /* try_connections */
 #include "s_user.h"
 #include "s_stats.h"
diff --git a/src/kdparse.c b/src/kdparse.c
index e5321eac..ef64d9c8 100644
--- a/src/kdparse.c
+++ b/src/kdparse.c
@@ -25,7 +25,7 @@
  */
 
 #include "stdinc.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "hostmask.h"
diff --git a/src/s_log.c b/src/logger.c
similarity index 99%
rename from src/s_log.c
rename to src/logger.c
index f4f71ce1..3452ebe7 100644
--- a/src/s_log.c
+++ b/src/logger.c
@@ -36,7 +36,7 @@
 
 #include "stdinc.h"
 #include "ircd_defs.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_conf.h"
 #include "sprintf_irc.h"
 #include "send.h"
diff --git a/src/modules.c b/src/modules.c
index f71f34cc..068ab75e 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -28,7 +28,7 @@
 
 
 #include "modules.h"
-#include "s_log.h"
+#include "logger.h"
 #include "ircd.h"
 #include "client.h"
 #include "send.h"
diff --git a/src/newconf.c b/src/newconf.c
index e36882f2..4981e44b 100644
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -13,7 +13,7 @@
 #include "ircd_defs.h"
 #include "sprintf_irc.h"
 #include "common.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_conf.h"
 #include "s_user.h"
 #include "s_newconf.h"
diff --git a/src/parse.c b/src/parse.c
index 36976ce7..8aa8f801 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -35,7 +35,7 @@
 #include "sprintf_irc.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_stats.h"
 #include "send.h"
 #include "msg.h"
diff --git a/src/restart.c b/src/restart.c
index ead8b426..7dc5cf0e 100644
--- a/src/restart.c
+++ b/src/restart.c
@@ -28,7 +28,7 @@
 #include "restart.h"
 #include "ircd.h"
 #include "send.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_conf.h"
 #include "client.h"		
 #include "ircd_signal.h"
diff --git a/src/s_auth.c b/src/s_auth.c
index 7fe61bb1..0fabfb8d 100644
--- a/src/s_auth.c
+++ b/src/s_auth.c
@@ -45,7 +45,7 @@
 #include "numeric.h"
 #include "packet.h"
 #include "res.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_stats.h"
 #include "send.h"
 #include "hook.h"
diff --git a/src/s_conf.c b/src/s_conf.c
index e34a77e2..47141e89 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -42,7 +42,7 @@
 #include "hostmask.h"
 #include "modules.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
 #include "s_gline.h"
 #include "reject.h"
diff --git a/src/s_serv.c b/src/s_serv.c
index 88d0ae00..886981db 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -44,7 +44,7 @@
 #include "res.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_stats.h"
 #include "s_user.h"
 #include "scache.h"
diff --git a/src/s_user.c b/src/s_user.c
index 2428c856..9befac27 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -39,7 +39,7 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "s_stats.h"
 #include "scache.h"
diff --git a/src/send.c b/src/send.c
index 1f0bb163..9cbfae73 100644
--- a/src/send.c
+++ b/src/send.c
@@ -37,7 +37,7 @@
 #include "sprintf_irc.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "hook.h"
 #include "monitor.h"
 
diff --git a/unsupported/m_force.c b/unsupported/m_force.c
index 20a3ccf4..84159e90 100644
--- a/unsupported/m_force.c
+++ b/unsupported/m_force.c
@@ -41,7 +41,7 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "send.h"
 #include "hash.h"
 #include "s_serv.h"