Set all of the core modules versions to VERSION_STRING - SVN is now officially not used anymore

155 files changed, 156 insertions, 155 deletions

diff --git a/src/core/bs_act.c b/src/core/bs_act.c
index a719b254a..8e3aa663f 100644
--- a/src/core/bs_act.c
+++ b/src/core/bs_act.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("ACT", do_act, NULL, BOT_HELP_ACT, -1, -1, -1, -1);
     moduleAddCommand(BOTSERV, c, MOD_UNIQUE);
diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c
index 3d94c89f1..4b59f5854 100644
--- a/src/core/bs_assign.c
+++ b/src/core/bs_assign.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("ASSIGN", do_assign, NULL, BOT_HELP_ASSIGN, -1, -1,
                       -1, -1);
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c
index 5f9eb29a7..b8ac3b28a 100644
--- a/src/core/bs_badwords.c
+++ b/src/core/bs_badwords.c
@@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("BADWORDS", do_badwords, NULL, BOT_HELP_BADWORDS, -1,
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index 7feedfb87..f460937e0 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -31,7 +31,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("BOT", do_bot, is_services_admin, -1, -1, -1,
diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c
index 1e288f3bf..b375ae0f9 100644
--- a/src/core/bs_botlist.c
+++ b/src/core/bs_botlist.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("BOTLIST", do_botlist, NULL, BOT_HELP_BOTLIST, -1,
                       -1, -1, -1);
diff --git a/src/core/bs_fantasy.c b/src/core/bs_fantasy.c
index c3fd9678f..cb6e013bd 100644
--- a/src/core/bs_fantasy.c
+++ b/src/core/bs_fantasy.c
@@ -28,7 +28,7 @@ int AnopeInit(int argc, char **argv)
     EvtHook *hook;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
     moduleAddEventHook(hook);
diff --git a/src/core/bs_fantasy_kick.c b/src/core/bs_fantasy_kick.c
index e3824c4f9..b9f701e3d 100644
--- a/src/core/bs_fantasy_kick.c
+++ b/src/core/bs_fantasy_kick.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
 
     hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
diff --git a/src/core/bs_fantasy_kickban.c b/src/core/bs_fantasy_kickban.c
index b8123f3cd..95d0e48d6 100644
--- a/src/core/bs_fantasy_kickban.c
+++ b/src/core/bs_fantasy_kickban.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
 
     hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
diff --git a/src/core/bs_fantasy_owner.c b/src/core/bs_fantasy_owner.c
index 406a44086..d8a0a1f84 100644
--- a/src/core/bs_fantasy_owner.c
+++ b/src/core/bs_fantasy_owner.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
 
     /* No need to load of we don't support owner */
diff --git a/src/core/bs_fantasy_seen.c b/src/core/bs_fantasy_seen.c
index c88d8408d..1d9751423 100644
--- a/src/core/bs_fantasy_seen.c
+++ b/src/core/bs_fantasy_seen.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
 
     hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
diff --git a/src/core/bs_help.c b/src/core/bs_help.c
index 894461074..5958208b5 100644
--- a/src/core/bs_help.c
+++ b/src/core/bs_help.c
@@ -28,7 +28,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
     moduleAddCommand(BOTSERV, c, MOD_UNIQUE);
diff --git a/src/core/bs_info.c b/src/core/bs_info.c
index c617447f7..3253a4d97 100644
--- a/src/core/bs_info.c
+++ b/src/core/bs_info.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("INFO", do_info, NULL, BOT_HELP_INFO, -1, -1, -1,
                       -1);
diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c
index 9d7d2c21e..3f97dba95 100644
--- a/src/core/bs_kick.c
+++ b/src/core/bs_kick.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("KICK", do_kickcmd, NULL, BOT_HELP_KICK, -1, -1, -1,
                       -1);
diff --git a/src/core/bs_say.c b/src/core/bs_say.c
index 517ed1bc1..5b7a84b17 100644
--- a/src/core/bs_say.c
+++ b/src/core/bs_say.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("SAY", do_say, NULL, BOT_HELP_SAY, -1, -1, -1, -1);
     moduleAddCommand(BOTSERV, c, MOD_UNIQUE);
diff --git a/src/core/bs_set.c b/src/core/bs_set.c
index 169f5b424..466dbb246 100644
--- a/src/core/bs_set.c
+++ b/src/core/bs_set.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SET", do_set, NULL, BOT_HELP_SET, -1, -1,
diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c
index 11d1a90ef..2670fee00 100644
--- a/src/core/bs_unassign.c
+++ b/src/core/bs_unassign.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("UNASSIGN", do_unassign, NULL, BOT_HELP_UNASSIGN, -1,
                       -1, -1, -1);
diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index 9d8c31c9b..6f7c75aff 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -33,7 +33,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("ACCESS", do_access, NULL, CHAN_HELP_ACCESS, -1, -1,
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index 44511a7c1..6b50be117 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -31,7 +31,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("AKICK", do_akick, NULL, CHAN_HELP_AKICK, -1, -1, -1,
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index 5f14d1fc3..c0919835b 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("BAN", do_ban, NULL, CHAN_HELP_BAN, -1, -1, -1, -1);
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index efaba0e5f..c6f8535cb 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("CLEAR", do_clear, NULL, CHAN_HELP_CLEAR, -1, -1, -1,
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c
index 2537e2514..94f7dd93a 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("DROP", do_drop, NULL, -1, CHAN_HELP_DROP, -1,
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index f7e3aca1b..ad57a7061 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("FORBID", do_forbid, is_services_admin, -1, -1, -1,
diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c
index a86c0a445..53c204339 100644
--- a/src/core/cs_getkey.c
+++ b/src/core/cs_getkey.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("GETKEY", do_getkey, NULL, CHAN_HELP_GETKEY, -1, -1,
diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c
index 8ee9a76bc..485fb8e7b 100644
--- a/src/core/cs_getpass.c
+++ b/src/core/cs_getpass.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("GETPASS", do_getpass, is_services_admin, -1, -1, -1,
diff --git a/src/core/cs_help.c b/src/core/cs_help.c
index 633bbb007..1d3dde9b4 100644
--- a/src/core/cs_help.c
+++ b/src/core/cs_help.c
@@ -28,7 +28,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c
index cab5c22c9..1d9c2a1c5 100644
--- a/src/core/cs_identify.c
+++ b/src/core/cs_identify.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("IDENTIFY", do_identify, NULL, CHAN_HELP_IDENTIFY,
diff --git a/src/core/cs_info.c b/src/core/cs_info.c
index a291a12e2..e3370471e 100644
--- a/src/core/cs_info.c
+++ b/src/core/cs_info.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("INFO", do_info, NULL, CHAN_HELP_INFO, -1,
diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c
index 60340a4ec..b699fb771 100644
--- a/src/core/cs_invite.c
+++ b/src/core/cs_invite.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("INVITE", do_invite, NULL, CHAN_HELP_INVITE, -1, -1,
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c
index bf8fe72d0..c68f202cc 100644
--- a/src/core/cs_kick.c
+++ b/src/core/cs_kick.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("KICK", do_cs_kick, NULL, CHAN_HELP_KICK, -1, -1, -1,
diff --git a/src/core/cs_list.c b/src/core/cs_list.c
index 646277fbc..ee9bf356a 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("LIST", do_list, NULL, -1, CHAN_HELP_LIST,
diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c
index 67b5d8e50..290658df2 100644
--- a/src/core/cs_logout.c
+++ b/src/core/cs_logout.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("LOGOUT", do_logout, NULL, -1, CHAN_HELP_LOGOUT, -1,
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c
index bdb162d3e..1f34392f1 100644
--- a/src/core/cs_modes.c
+++ b/src/core/cs_modes.c
@@ -39,7 +39,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("OP", do_op, NULL, CHAN_HELP_OP, -1, -1, -1, -1);
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index 1b631a733..dac4007ba 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("REGISTER", do_register, NULL, CHAN_HELP_REGISTER,
diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c
index 01da61225..617533f9d 100644
--- a/src/core/cs_sendpass.c
+++ b/src/core/cs_sendpass.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SENDPASS", do_sendpass, NULL, CHAN_HELP_SENDPASS,
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index 93209782b..b4fafb6f6 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -51,7 +51,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SET", do_set, NULL, CHAN_HELP_SET, -1, -1,
diff --git a/src/core/cs_status.c b/src/core/cs_status.c
index b4c7b110d..c1a1f4a43 100644
--- a/src/core/cs_status.c
+++ b/src/core/cs_status.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("STATUS", do_status, is_services_admin, -1, -1, -1,
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index 40278ea52..f2cd30378 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SUSPEND", do_suspend, is_services_oper, -1, -1,
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index d69c11d38..341526c0a 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("TOPIC", do_cs_topic, NULL, CHAN_HELP_TOPIC, -1, -1,
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index 8a57f400d..e5a4be142 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -93,7 +93,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("AOP", do_aop, NULL, CHAN_HELP_AOP, -1, -1, -1, -1);
diff --git a/src/core/enc_md5.c b/src/core/enc_md5.c
index 17ae8726b..b9f12ed57 100644
--- a/src/core/enc_md5.c
+++ b/src/core/enc_md5.c
@@ -400,7 +400,7 @@ int md5_check_password(const char *plaintext, const char *password)
 int AnopeInit(int argc, char **argv) {
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(ENCRYPTION);
  
     encmodule_encrypt(md5_encrypt);
diff --git a/src/core/enc_none.c b/src/core/enc_none.c
index 14b52d4f4..aa5fd0a96 100644
--- a/src/core/enc_none.c
+++ b/src/core/enc_none.c
@@ -19,7 +19,7 @@ int plain_check_password(const char *plaintext, const char *password);
 int AnopeInit(int argc, char **argv) {
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(ENCRYPTION);
  
     encmodule_encrypt(plain_encrypt);
diff --git a/src/core/enc_old.c b/src/core/enc_old.c
index d68aa40ec..8a42d4aaa 100644
--- a/src/core/enc_old.c
+++ b/src/core/enc_old.c
@@ -427,7 +427,7 @@ int old_decrypt(const char *src, char *dest, int size)
 int AnopeInit(int argc, char **argv) {
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(ENCRYPTION);
 
     encmodule_encrypt(old_encrypt);
diff --git a/src/core/enc_sha1.c b/src/core/enc_sha1.c
index 6a2f22860..4ab4afcdb 100644
--- a/src/core/enc_sha1.c
+++ b/src/core/enc_sha1.c
@@ -251,7 +251,7 @@ int sha1_check_password(const char *plaintext, const char *password)
 int AnopeInit(int argc, char **argv) {
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(ENCRYPTION);
  
     encmodule_encrypt(sha1_encrypt);
diff --git a/src/core/he_help.c b/src/core/he_help.c
index f96acdcee..3ee489b01 100644
--- a/src/core/he_help.c
+++ b/src/core/he_help.c
@@ -28,7 +28,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
diff --git a/src/core/hs_del.c b/src/core/hs_del.c
index d8ebb4df3..9a9c7f8c0 100644
--- a/src/core/hs_del.c
+++ b/src/core/hs_del.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("DEL", do_del, is_host_remover, HOST_HELP_DEL, -1,
diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c
index f3cf42494..e4fda45ee 100644
--- a/src/core/hs_delall.c
+++ b/src/core/hs_delall.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("DELALL", do_delall, is_host_remover,
diff --git a/src/core/hs_group.c b/src/core/hs_group.c
index ad7be4dad..217a7c185 100644
--- a/src/core/hs_group.c
+++ b/src/core/hs_group.c
@@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("GROUP", do_group, NULL, HOST_HELP_GROUP, -1, -1, -1,
diff --git a/src/core/hs_help.c b/src/core/hs_help.c
index 988c70c24..3b9bb52d7 100644
--- a/src/core/hs_help.c
+++ b/src/core/hs_help.c
@@ -28,7 +28,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
diff --git a/src/core/hs_list.c b/src/core/hs_list.c
index 5e49f73d2..0fb14e852 100644
--- a/src/core/hs_list.c
+++ b/src/core/hs_list.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("LIST", listOut, is_services_oper, -1, -1,
diff --git a/src/core/hs_off.c b/src/core/hs_off.c
index 8dd73f8f4..8583d5108 100644
--- a/src/core/hs_off.c
+++ b/src/core/hs_off.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("OFF", do_off, NULL, HOST_HELP_OFF, -1, -1, -1, -1);
diff --git a/src/core/hs_on.c b/src/core/hs_on.c
index fb3890a00..94ce3a706 100644
--- a/src/core/hs_on.c
+++ b/src/core/hs_on.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("ON", do_on, NULL, HOST_HELP_ON, -1, -1, -1, -1);
diff --git a/src/core/hs_set.c b/src/core/hs_set.c
index 4cbc30afa..634d71737 100644
--- a/src/core/hs_set.c
+++ b/src/core/hs_set.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SET", myDoSet, is_host_setter, HOST_HELP_SET, -1,
diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c
index a7aad270a..e2827f5c0 100644
--- a/src/core/hs_setall.c
+++ b/src/core/hs_setall.c
@@ -31,7 +31,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SETALL", do_setall, is_host_setter,
diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.c
index de57f4e2b..99fc0906b 100644
--- a/src/core/ms_cancel.c
+++ b/src/core/ms_cancel.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("CANCEL", do_cancel, NULL, MEMO_HELP_CANCEL, -1, -1,
                       -1, -1);
diff --git a/src/core/ms_check.c b/src/core/ms_check.c
index 6ef85c01f..a9eb3ef51 100644
--- a/src/core/ms_check.c
+++ b/src/core/ms_check.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("CHECK", do_memocheck, NULL, MEMO_HELP_CHECK, -1, -1,
                       -1, -1);
diff --git a/src/core/ms_del.c b/src/core/ms_del.c
index 2fe2a4427..54acf05fd 100644
--- a/src/core/ms_del.c
+++ b/src/core/ms_del.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("DEL", do_del, NULL, MEMO_HELP_DEL, -1, -1, -1, -1);
     moduleAddCommand(MEMOSERV, c, MOD_UNIQUE);
diff --git a/src/core/ms_help.c b/src/core/ms_help.c
index 2e6af8cd5..4c6f5830a 100644
--- a/src/core/ms_help.c
+++ b/src/core/ms_help.c
@@ -28,7 +28,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
     moduleAddCommand(MEMOSERV, c, MOD_UNIQUE);
diff --git a/src/core/ms_info.c b/src/core/ms_info.c
index 9c927abae..d650abcd2 100644
--- a/src/core/ms_info.c
+++ b/src/core/ms_info.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("INFO", do_info, NULL, -1, MEMO_HELP_INFO, -1,
                       MEMO_SERVADMIN_HELP_INFO, MEMO_SERVADMIN_HELP_INFO);
diff --git a/src/core/ms_list.c b/src/core/ms_list.c
index 0df76a766..5e9d170f0 100644
--- a/src/core/ms_list.c
+++ b/src/core/ms_list.c
@@ -31,7 +31,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("LIST", do_list, NULL, MEMO_HELP_LIST, -1, -1, -1,
                       -1);
diff --git a/src/core/ms_read.c b/src/core/ms_read.c
index ef5901236..49b59e70d 100644
--- a/src/core/ms_read.c
+++ b/src/core/ms_read.c
@@ -33,7 +33,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("READ", do_read, NULL, MEMO_HELP_READ, -1, -1, -1,
                       -1);
diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c
index 0aba6a2bb..67dafd6f7 100644
--- a/src/core/ms_rsend.c
+++ b/src/core/ms_rsend.c
@@ -35,7 +35,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("RSEND", do_rsend, NULL, MEMO_HELP_RSEND, -1, -1, -1,
                       -1);
diff --git a/src/core/ms_send.c b/src/core/ms_send.c
index 1ccf0a42b..d59446bad 100644
--- a/src/core/ms_send.c
+++ b/src/core/ms_send.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("SEND", do_send, NULL, MEMO_HELP_SEND, -1, -1, -1,
                       -1);
diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c
index 2bef520f4..d3602d50f 100644
--- a/src/core/ms_sendall.c
+++ b/src/core/ms_sendall.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("SENDALL", do_sendall, is_services_admin, -1, -1, -1,
                       MEMO_HELP_SENDALL, MEMO_HELP_SENDALL);
diff --git a/src/core/ms_set.c b/src/core/ms_set.c
index a19581a07..734d75374 100644
--- a/src/core/ms_set.c
+++ b/src/core/ms_set.c
@@ -31,7 +31,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SET", do_set, NULL, MEMO_HELP_SET, -1, -1, -1, -1);
diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c
index 43a1fa5ff..6ba209809 100644
--- a/src/core/ms_staff.c
+++ b/src/core/ms_staff.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("STAFF", do_staff, is_services_oper, -1, -1,
                       MEMO_HELP_STAFF, MEMO_HELP_STAFF, MEMO_HELP_STAFF);
diff --git a/src/core/ns_access.c b/src/core/ns_access.c
index 25296cf8b..9058b5413 100644
--- a/src/core/ns_access.c
+++ b/src/core/ns_access.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("ACCESS", do_access, NULL, NICK_HELP_ACCESS, -1, -1,
diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c
index bfcac1130..1d2c61eb4 100644
--- a/src/core/ns_alist.c
+++ b/src/core/ns_alist.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("ALIST", do_alist, NULL, -1, NICK_HELP_ALIST, -1,
diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c
index 6c52e03fc..151103404 100644
--- a/src/core/ns_drop.c
+++ b/src/core/ns_drop.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("DROP", do_drop, NULL, -1, NICK_HELP_DROP, -1,
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index ed8ec71ed..a9a5131de 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("FORBID", do_forbid, is_services_admin, -1, -1, -1,
diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.c
index cc3bc2519..6dd60484e 100644
--- a/src/core/ns_getemail.c
+++ b/src/core/ns_getemail.c
@@ -34,7 +34,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("GETEMAIL", do_getemail, is_services_admin, -1, -1,
diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c
index 642637187..6c79c709b 100644
--- a/src/core/ns_getpass.c
+++ b/src/core/ns_getpass.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("GETPASS", do_getpass, is_services_admin, -1, -1, -1,
diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c
index d051b8294..cd478bfe1 100644
--- a/src/core/ns_ghost.c
+++ b/src/core/ns_ghost.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("GHOST", do_ghost, NULL, NICK_HELP_GHOST, -1, -1, -1,
diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index a3b85d868..5641cd739 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -36,7 +36,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("GROUP", do_group, NULL, NICK_HELP_GROUP, -1, -1, -1,
diff --git a/src/core/ns_help.c b/src/core/ns_help.c
index 99ed11e4d..42f94b1e4 100644
--- a/src/core/ns_help.c
+++ b/src/core/ns_help.c
@@ -28,7 +28,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c
index 5bf30df06..51e8ccefb 100644
--- a/src/core/ns_identify.c
+++ b/src/core/ns_identify.c
@@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("ID", do_identify, NULL, NICK_HELP_IDENTIFY, -1, -1,
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index 7f04273a4..aa537cf10 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("INFO", do_info, NULL, NICK_HELP_INFO, -1,
diff --git a/src/core/ns_list.c b/src/core/ns_list.c
index 4dd40e904..e37212b1c 100644
--- a/src/core/ns_list.c
+++ b/src/core/ns_list.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("LIST", do_list, NULL, -1, NICK_HELP_LIST, -1,
diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c
index 5b81ceb81..45c110c1e 100644
--- a/src/core/ns_logout.c
+++ b/src/core/ns_logout.c
@@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("LOGOUT", do_logout, NULL, -1, NICK_HELP_LOGOUT, -1,
diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c
index 40862cd3b..54a0a800d 100644
--- a/src/core/ns_recover.c
+++ b/src/core/ns_recover.c
@@ -30,7 +30,7 @@ int myHelpResonse(User * u);
 int AnopeInit(int argc, char **argv)
 {
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("RECOVER", do_recover, NULL, -1, -1, -1, -1, -1);
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index ec5cefdad..d18ba10a8 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -36,7 +36,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("REGISTER", do_register, NULL, NICK_HELP_REGISTER,
diff --git a/src/core/ns_release.c b/src/core/ns_release.c
index e40251ba0..27ceb1efc 100644
--- a/src/core/ns_release.c
+++ b/src/core/ns_release.c
@@ -30,7 +30,7 @@ int myHelpResonse(User * u);
 int AnopeInit(int argc, char **argv)
 {
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("RELEASE", do_release, NULL, -1, -1, -1, -1, -1);
diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c
index a3e2463e4..029010eaf 100644
--- a/src/core/ns_saset.c
+++ b/src/core/ns_saset.c
@@ -44,7 +44,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SASET", do_saset, is_services_oper, -1, -1,
diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c
index 5beb9dc01..111f07d3e 100644
--- a/src/core/ns_sendpass.c
+++ b/src/core/ns_sendpass.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SENDPASS", do_sendpass, NULL, NICK_HELP_SENDPASS,
diff --git a/src/core/ns_set.c b/src/core/ns_set.c
index f7fe83cbd..bdb8f0760 100644
--- a/src/core/ns_set.c
+++ b/src/core/ns_set.c
@@ -43,7 +43,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SET", do_set, NULL, NICK_HELP_SET, -1, -1, -1, -1);
diff --git a/src/core/ns_status.c b/src/core/ns_status.c
index 81f5207d3..9bb841f16 100644
--- a/src/core/ns_status.c
+++ b/src/core/ns_status.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("STATUS", do_status, NULL, NICK_HELP_STATUS, -1, -1,
diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c
index e720f132a..4e5f7031d 100644
--- a/src/core/ns_suspend.c
+++ b/src/core/ns_suspend.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SUSPEND", do_suspend, is_services_oper, -1, -1,
diff --git a/src/core/ns_update.c b/src/core/ns_update.c
index 664d97fcb..b3f368dac 100644
--- a/src/core/ns_update.c
+++ b/src/core/ns_update.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("UPDATE", do_nickupdate, NULL, NICK_HELP_UPDATE, -1,
diff --git a/src/core/os_admin.c b/src/core/os_admin.c
index 33e533760..7c0494510 100644
--- a/src/core/os_admin.c
+++ b/src/core/os_admin.c
@@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("ADMIN", do_admin, NULL, OPER_HELP_ADMIN, -1, -1,
diff --git a/src/core/os_akill.c b/src/core/os_akill.c
index 61e13902c..d75919228 100644
--- a/src/core/os_akill.c
+++ b/src/core/os_akill.c
@@ -36,7 +36,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("AKILL", do_akill, is_services_oper, OPER_HELP_AKILL,
                       -1, -1, -1, -1);
diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c
index f89b28a9c..6934fffb9 100644
--- a/src/core/os_chankill.c
+++ b/src/core/os_chankill.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("CHANKILL", do_chankill, is_services_admin,
diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c
index 96260ca85..4d8da238f 100644
--- a/src/core/os_chanlist.c
+++ b/src/core/os_chanlist.c
@@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("CHANLIST", do_chanlist, is_services_oper,
diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c
index 4c398076e..bf8da9183 100644
--- a/src/core/os_clearmodes.c
+++ b/src/core/os_clearmodes.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("CLEARMODES", do_clearmodes, is_services_oper,
diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c
index c5e443068..f3fad2705 100644
--- a/src/core/os_defcon.c
+++ b/src/core/os_defcon.c
@@ -35,7 +35,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("DEFCON", do_defcon, is_services_admin,
diff --git a/src/core/os_global.c b/src/core/os_global.c
index ad680808b..227a4acc4 100644
--- a/src/core/os_global.c
+++ b/src/core/os_global.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("GLOBAL", do_global, is_services_admin,
diff --git a/src/core/os_help.c b/src/core/os_help.c
index dadbe0fac..51489de94 100644
--- a/src/core/os_help.c
+++ b/src/core/os_help.c
@@ -28,7 +28,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
     moduleAddCommand(OPERSERV, c, MOD_UNIQUE);
diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c
index 8c8d455b0..b9dfbcf0a 100644
--- a/src/core/os_ignore.c
+++ b/src/core/os_ignore.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("IGNORE", do_ignoreuser, is_services_admin,
                       OPER_HELP_IGNORE, -1, -1, -1, -1);
diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c
index e64b6d8be..434527ee7 100644
--- a/src/core/os_jupe.c
+++ b/src/core/os_jupe.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("JUPE", do_jupe, is_services_admin, OPER_HELP_JUPE,
diff --git a/src/core/os_kick.c b/src/core/os_kick.c
index f78baa49e..cd9bf2eb0 100644
--- a/src/core/os_kick.c
+++ b/src/core/os_kick.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("KICK", do_os_kick, is_services_oper, OPER_HELP_KICK,
diff --git a/src/core/os_logonnews.c b/src/core/os_logonnews.c
index 1880612c4..ea662cbf1 100644
--- a/src/core/os_logonnews.c
+++ b/src/core/os_logonnews.c
@@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv)
     char buf[BUFSIZE];
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     /** 
diff --git a/src/core/os_mode.c b/src/core/os_mode.c
index ef66ba7c0..b8306c14a 100644
--- a/src/core/os_mode.c
+++ b/src/core/os_mode.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("MODE", do_os_mode, is_services_oper, OPER_HELP_MODE,
diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.c
index 01b4372f1..b93e7e40a 100644
--- a/src/core/os_modinfo.c
+++ b/src/core/os_modinfo.c
@@ -31,7 +31,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("MODINFO", do_modinfo, NULL, -1, -1, -1, -1,
                       OPER_HELP_MODINFO);
diff --git a/src/core/os_modlist.c b/src/core/os_modlist.c
index 272b0e17a..e7076109d 100644
--- a/src/core/os_modlist.c
+++ b/src/core/os_modlist.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("MODLIST", do_modlist, NULL, -1, -1, -1, -1,
diff --git a/src/core/os_modload.c b/src/core/os_modload.c
index f9cff419f..a5d93ea82 100644
--- a/src/core/os_modload.c
+++ b/src/core/os_modload.c
@@ -30,7 +30,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("MODLOAD", do_modload, is_services_root, -1, -1, -1,
diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c
index 9a374746c..405c2d2f1 100644
--- a/src/core/os_modunload.c
+++ b/src/core/os_modunload.c
@@ -31,7 +31,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("MODUNLOAD", do_modunload, is_services_root, -1, -1,
diff --git a/src/core/os_noop.c b/src/core/os_noop.c
index d32c6fc3b..8f4d1de3f 100644
--- a/src/core/os_noop.c
+++ b/src/core/os_noop.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("NOOP", do_noop, is_services_admin, OPER_HELP_NOOP,
diff --git a/src/core/os_oline.c b/src/core/os_oline.c
index 8a594071d..62ad9d3c6 100644
--- a/src/core/os_oline.c
+++ b/src/core/os_oline.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("OLINE", do_operoline, is_services_root,
diff --git a/src/core/os_oper.c b/src/core/os_oper.c
index 04faf408c..040dec215 100644
--- a/src/core/os_oper.c
+++ b/src/core/os_oper.c
@@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("OPER", do_oper, NULL, OPER_HELP_OPER, -1, -1, -1,
                       -1);
diff --git a/src/core/os_opernews.c b/src/core/os_opernews.c
index 648d4f354..62b0337c4 100644
--- a/src/core/os_opernews.c
+++ b/src/core/os_opernews.c
@@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv)
     char buf[BUFSIZE];
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     /** 
diff --git a/src/core/os_quit.c b/src/core/os_quit.c
index 80c545cb4..37bd05a54 100644
--- a/src/core/os_quit.c
+++ b/src/core/os_quit.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("QUIT", do_os_quit, is_services_root,
diff --git a/src/core/os_randomnews.c b/src/core/os_randomnews.c
index 19ce29b2b..e0d424b9a 100644
--- a/src/core/os_randomnews.c
+++ b/src/core/os_randomnews.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
 
     /** 
diff --git a/src/core/os_raw.c b/src/core/os_raw.c
index 1738a94b4..c7dc6d24c 100644
--- a/src/core/os_raw.c
+++ b/src/core/os_raw.c
@@ -28,7 +28,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(THIRD);
 
     c = createCommand("RAW", do_raw, is_services_root, OPER_HELP_RAW, -1,
diff --git a/src/core/os_reload.c b/src/core/os_reload.c
index af0e990a1..e1615b634 100644
--- a/src/core/os_reload.c
+++ b/src/core/os_reload.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("RELOAD", do_reload, is_services_root,
diff --git a/src/core/os_restart.c b/src/core/os_restart.c
index 2e95f0757..0322d7270 100644
--- a/src/core/os_restart.c
+++ b/src/core/os_restart.c
@@ -34,7 +34,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
     c = createCommand("RESTART", do_restart, is_services_root,
                       OPER_HELP_RESTART, -1, -1, -1, -1);
diff --git a/src/core/os_session.c b/src/core/os_session.c
index bb79bcc63..7647ff0e3 100644
--- a/src/core/os_session.c
+++ b/src/core/os_session.c
@@ -28,7 +28,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     /**
diff --git a/src/core/os_set.c b/src/core/os_set.c
index 1f0f8081b..a25435ff4 100644
--- a/src/core/os_set.c
+++ b/src/core/os_set.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SET", do_set, is_services_root, OPER_HELP_SET, -1,
diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c
index dcf31e5b9..19273e916 100644
--- a/src/core/os_sgline.c
+++ b/src/core/os_sgline.c
@@ -36,7 +36,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SGLINE", do_sgline, is_services_oper,
diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c
index 2cab3468d..40a110a72 100644
--- a/src/core/os_shutdown.c
+++ b/src/core/os_shutdown.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SHUTDOWN", do_shutdown, is_services_root,
diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c
index caba1dd5b..e63c09d4b 100644
--- a/src/core/os_sqline.c
+++ b/src/core/os_sqline.c
@@ -36,7 +36,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SQLINE", do_sqline, is_services_oper,
diff --git a/src/core/os_staff.c b/src/core/os_staff.c
index 402d16bcf..676fa7888 100644
--- a/src/core/os_staff.c
+++ b/src/core/os_staff.c
@@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("STAFF", do_staff, NULL, OPER_HELP_STAFF, -1, -1,
diff --git a/src/core/os_stats.c b/src/core/os_stats.c
index 0d7ecf810..362672d0b 100644
--- a/src/core/os_stats.c
+++ b/src/core/os_stats.c
@@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("STATS", do_stats, NULL, OPER_HELP_STATS,
diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c
index a91b3221d..93adfe1d4 100644
--- a/src/core/os_svsnick.c
+++ b/src/core/os_svsnick.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SVSNICK", do_svsnick, is_services_root,
diff --git a/src/core/os_szline.c b/src/core/os_szline.c
index 94aac78f0..efbaba2f8 100644
--- a/src/core/os_szline.c
+++ b/src/core/os_szline.c
@@ -35,7 +35,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("SZLINE", do_szline, is_services_oper,
diff --git a/src/core/os_umode.c b/src/core/os_umode.c
index 9d5ef9e85..8eb477629 100644
--- a/src/core/os_umode.c
+++ b/src/core/os_umode.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("UMODE", do_operumodes, is_services_root,
diff --git a/src/core/os_update.c b/src/core/os_update.c
index 6ab9e25e0..5afccfca8 100644
--- a/src/core/os_update.c
+++ b/src/core/os_update.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("UPDATE", do_update, is_services_root,
diff --git a/src/core/os_userlist.c b/src/core/os_userlist.c
index 19d210be7..e7bc80504 100644
--- a/src/core/os_userlist.c
+++ b/src/core/os_userlist.c
@@ -34,7 +34,7 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(CORE);
 
     c = createCommand("USERLIST", do_userlist, NULL,
diff --git a/src/modules/bs_fantasy_unban.c b/src/modules/bs_fantasy_unban.c
index d1b46cd24..4a480f273 100644
--- a/src/modules/bs_fantasy_unban.c
+++ b/src/modules/bs_fantasy_unban.c
@@ -29,7 +29,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(CORE);
 
     hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c
index fa00f4fe7..f91b58874 100644
--- a/src/modules/cs_appendtopic.c
+++ b/src/modules/cs_appendtopic.c
@@ -19,7 +19,7 @@
 #include "module.h"
 
 #define AUTHOR "SGR"
-#define VERSION "$Id$"
+#define VERSION VERSION_STRING
 
   /* ------------------------------------------------------------
    * Name: cs_appendtopic
diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c
index 03cb0d8f4..c605a7deb 100644
--- a/src/modules/cs_enforce.c
+++ b/src/modules/cs_enforce.c
@@ -16,7 +16,7 @@
 #include "module.h"
 
 #define AUTHOR "Anope"
-#define VERSION "$Id$"
+#define VERSION VERSION_STRING
 
 int my_cs_enforce(User * u);
 void my_cs_help(User * u);
diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c
index 0d67d4ce5..fd949c5df 100644
--- a/src/modules/cs_tban.c
+++ b/src/modules/cs_tban.c
@@ -19,7 +19,7 @@
 #include "module.h"
 
 #define AUTHOR "Rob"
-#define VERSION "$Id$"
+#define VERSION VERSION_STRING
 
 void myHelp(User * u);
 void myFullHelpSyntax(User * u);
diff --git a/src/modules/extra/atheme2anope/atheme2anope.c b/src/modules/extra/atheme2anope/atheme2anope.c
index 6430f2a6d..49cbc1b1e 100644
--- a/src/modules/extra/atheme2anope/atheme2anope.c
+++ b/src/modules/extra/atheme2anope/atheme2anope.c
@@ -44,7 +44,7 @@ void WriteAkill(char *line);
 int AnopeInit(int argc, char **argv)
 {
 	moduleAddAuthor("Anope");
-	moduleAddVersion("$Id$");
+	moduleAddVersion(VERSION_STRING);
 	moduleSetType(SUPPORTED);
 
 	athemedb = fopen(ATHEMEDATABASE, "r");
diff --git a/src/modules/extra/atheme2anope/atheme2anope_identify.c b/src/modules/extra/atheme2anope/atheme2anope_identify.c
index e3e1c251a..8cfe79c6b 100644
--- a/src/modules/extra/atheme2anope/atheme2anope_identify.c
+++ b/src/modules/extra/atheme2anope/atheme2anope_identify.c
@@ -30,7 +30,7 @@ int decrypt_password_md5(NickAlias *na, char *pass, char *tmp_pass);
 int AnopeInit(int argc, char **argv)
 {
 	moduleAddAuthor("Anope");
-	moduleAddVersion("$Id$");
+	moduleAddVersion(VERSION_STRING);
 	moduleSetType(SUPPORTED);
 
 	Command *c;
diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c
index 20dcaaf74..72d1c46f6 100644
--- a/src/modules/hs_request.c
+++ b/src/modules/hs_request.c
@@ -18,7 +18,7 @@
 #include "module.h"
 
 #define AUTHOR "Rob"
-#define VERSION "$Id$"
+#define VERSION VERSION_STRING
 
 /* Configuration variables */
 int HSRequestMemoUser = 0;
diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c
index b6abdee57..82dd4c48b 100644
--- a/src/modules/ns_maxemail.c
+++ b/src/modules/ns_maxemail.c
@@ -16,7 +16,7 @@
 #include "module.h"
 
 #define AUTHOR "Anope"
-#define VERSION "$Id$"
+#define VERSION VERSION_STRING
 
 void my_load_config(void);
 void my_add_languages(void);
diff --git a/src/modules/ns_noop_convert.c b/src/modules/ns_noop_convert.c
index dedba1ba3..24abd0bb7 100644
--- a/src/modules/ns_noop_convert.c
+++ b/src/modules/ns_noop_convert.c
@@ -19,7 +19,7 @@
 #include "module.h"
 
 #define AUTHOR "Rob"
-#define VERSION "$Id$"
+#define VERSION VERSION_STRING
 
 /* The name of the default database to save info to */
 #define DEFAULT_DB_NAME "autoop.db"
diff --git a/src/modules/os_ignore_db.c b/src/modules/os_ignore_db.c
index 84004b93f..284df65d5 100644
--- a/src/modules/os_ignore_db.c
+++ b/src/modules/os_ignore_db.c
@@ -14,7 +14,7 @@
 #include "module.h"
 
 #define AUTHOR "Viper"
-#define VERSION "$Id$"
+#define VERSION VERSION_STRING
 
 /* Default database name */
 #define DefIgnoreDB "os_ignore.db"
diff --git a/src/modules/os_info.c b/src/modules/os_info.c
index 1ddfc1aff..d0716a9cd 100644
--- a/src/modules/os_info.c
+++ b/src/modules/os_info.c
@@ -19,7 +19,7 @@
 #include "module.h"
 
 #define AUTHOR "Rob"
-#define VERSION "$Id$"
+#define VERSION VERSION_STRING
 
 /* Default database name */
 #define DEFAULT_DB_NAME "os_info.db"
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 5afcb0cbe..4ec707c58 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1655,7 +1655,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(PROTOCOL);
 
     pmodule_ircd_version("BahamutIRCd 1.4.*/1.8.*");
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 7a3898f54..a0419fa04 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1966,7 +1966,7 @@ int AnopeInit(int argc, char **argv)
     EvtHook *hk;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(PROTOCOL);
 
     pmodule_ircd_version("Charybdis 1.0/1.1+");
diff --git a/src/protocol/dreamforge.c b/src/protocol/dreamforge.c
index 178287adc..4021dde26 100644
--- a/src/protocol/dreamforge.c
+++ b/src/protocol/dreamforge.c
@@ -1362,7 +1362,7 @@ int AnopeInit(int argc, char **argv)
 {
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(PROTOCOL);
 
     pmodule_ircd_version("DreamForge 4.6.7");
diff --git a/src/protocol/hybrid.c b/src/protocol/hybrid.c
index be3ab6841..aa8da94ac 100644
--- a/src/protocol/hybrid.c
+++ b/src/protocol/hybrid.c
@@ -1551,7 +1551,7 @@ int AnopeInit(int argc, char **argv)
 {
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(PROTOCOL);
 
     pmodule_ircd_version("Hybrid IRCd 7.0");
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 0cd011304..e1d0dbca5 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1935,7 +1935,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(PROTOCOL);
 
     pmodule_ircd_version("inspircdIRCd 1.1");
diff --git a/src/protocol/inspircd12.c b/src/protocol/inspircd12.c
index 78eda0106..578aadcdd 100644
--- a/src/protocol/inspircd12.c
+++ b/src/protocol/inspircd12.c
@@ -2648,7 +2648,7 @@ int AnopeInit(int argc, char **argv)
     int noforksave = nofork;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(PROTOCOL);
 
     if (!UseTS6) {
diff --git a/src/protocol/plexus2.c b/src/protocol/plexus2.c
index bc1611911..984e51945 100644
--- a/src/protocol/plexus2.c
+++ b/src/protocol/plexus2.c
@@ -1857,7 +1857,7 @@ AnopeInit (int argc, char **argv)
 {
 
   moduleAddAuthor ("Anope");
-  moduleAddVersion ("$Id$");
+  moduleAddVersion (VERSION_STRING);
   moduleSetType (PROTOCOL);
 
   pmodule_ircd_version ("PleXusIRCd 2.0+");
diff --git a/src/protocol/plexus3.c b/src/protocol/plexus3.c
index c42af5f5e..1e486e413 100644
--- a/src/protocol/plexus3.c
+++ b/src/protocol/plexus3.c
@@ -1834,7 +1834,7 @@ AnopeInit (int argc, char **argv)
 {
 
   moduleAddAuthor ("Anope");
-  moduleAddVersion ("$Id$");
+  moduleAddVersion (VERSION_STRING);
   moduleSetType (PROTOCOL);
 
   pmodule_ircd_version ("hybrid-7.2.1+plexus-3.0.0+");
diff --git a/src/protocol/ptlink.c b/src/protocol/ptlink.c
index 4e23cdd74..0f86c07c3 100644
--- a/src/protocol/ptlink.c
+++ b/src/protocol/ptlink.c
@@ -1774,7 +1774,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(PROTOCOL);
 
 
diff --git a/src/protocol/rageircd.c b/src/protocol/rageircd.c
index ac7b25625..5c8d8ad0c 100644
--- a/src/protocol/rageircd.c
+++ b/src/protocol/rageircd.c
@@ -1655,7 +1655,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(PROTOCOL);
 
     pmodule_ircd_version("RageIRCd 2.0.x");
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index d5dc33fc0..7b7d8589d 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1860,7 +1860,7 @@ int AnopeInit(int argc, char **argv)
 {
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(PROTOCOL);
 
     pmodule_ircd_version("Ratbox IRCD 2.0+");
diff --git a/src/protocol/shadowircd.c b/src/protocol/shadowircd.c
index e9a3da012..0525ff548 100644
--- a/src/protocol/shadowircd.c
+++ b/src/protocol/shadowircd.c
@@ -1811,7 +1811,7 @@ int AnopeInit(int argc, char **argv)
 {
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(PROTOCOL);
 
     pmodule_ircd_version("ShadowIRCd 4.0+");
diff --git a/src/protocol/solidircd.c b/src/protocol/solidircd.c
index 578c33b49..f195284fa 100644
--- a/src/protocol/solidircd.c
+++ b/src/protocol/solidircd.c
@@ -1683,7 +1683,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(PROTOCOL);
 
     pmodule_ircd_version("Solid-IRCd 3.4.*");
diff --git a/src/protocol/ultimate2.c b/src/protocol/ultimate2.c
index 9b409b37e..d457a6604 100644
--- a/src/protocol/ultimate2.c
+++ b/src/protocol/ultimate2.c
@@ -1712,7 +1712,7 @@ int AnopeInit(int argc, char **argv)
 {
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(PROTOCOL);
 
     pmodule_ircd_version("UltimateIRCd 2.8.2+");
diff --git a/src/protocol/ultimate3.c b/src/protocol/ultimate3.c
index 4c308d49b..95a2a0fef 100644
--- a/src/protocol/ultimate3.c
+++ b/src/protocol/ultimate3.c
@@ -1796,7 +1796,7 @@ int AnopeInit(int argc, char **argv)
 
     moduleAddAuthor("Anope");
     moduleAddVersion
-        ("$Id$");
+        (VERSION_STRING);
     moduleSetType(PROTOCOL);
 
     pmodule_ircd_version("UltimateIRCd 3.0.0.a26+");
diff --git a/src/protocol/unreal31.c b/src/protocol/unreal31.c
index b48db601e..93356b0a6 100644
--- a/src/protocol/unreal31.c
+++ b/src/protocol/unreal31.c
@@ -1577,7 +1577,7 @@ int AnopeInit(int argc, char **argv)
 {
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(PROTOCOL);
 
     pmodule_ircd_version("UnrealIRCd 3.1.1+");
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 77c618184..32663e802 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -2241,7 +2241,7 @@ int AnopeInit(int argc, char **argv)
 {
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(PROTOCOL);
 
     pmodule_ircd_version("UnrealIRCd 3.2+");
diff --git a/src/protocol/viagra.c b/src/protocol/viagra.c
index 9a10ae908..eae05aacd 100644
--- a/src/protocol/viagra.c
+++ b/src/protocol/viagra.c
@@ -1694,7 +1694,7 @@ int AnopeInit(int argc, char **argv)
 {
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion(VERSION_STRING);
     moduleSetType(PROTOCOL);
 
     pmodule_ircd_version("ViagraIRCd 1.3.x");
diff --git a/version.log b/version.log
index cbc513c6d..862a571e7 100644
--- a/version.log
+++ b/version.log
@@ -9,9 +9,10 @@ VERSION_MAJOR="1"
 VERSION_MINOR="8"
 VERSION_PATCH="4"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="3005"
+VERSION_BUILD="3006"
 
 # $Log$ # Changes since the 1.8.4 Release
+#Revision 3006 - Set all of the core modules versions to VERSION_STRING - SVN is now officially not used anymore
 #Revision 3005 - Fixed ./Config to correctly load the previously used settings from config.cache
 #Revision 3003 - Grab users cloaked hosts on Unreal after setting +x, fixes us never knowing cloaked hosts if the user is introduced with a vhost
 #Revision 3000 - Never unset mod_current_module in functions that modules might call, instead save the old values and reset them