Made all modules version be VERSION_STRING

127 files changed, 127 insertions, 127 deletions

diff --git a/src/core/bs_act.c b/src/core/bs_act.c
index 7849f322b..b6600a7a9 100644
--- a/src/core/bs_act.c
+++ b/src/core/bs_act.c
@@ -74,7 +74,7 @@ class BSAct : public Module
 	BSAct(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSAct());
 
diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c
index d518a6a9b..f30287d45 100644
--- a/src/core/bs_assign.c
+++ b/src/core/bs_assign.c
@@ -84,7 +84,7 @@ class BSAssign : public Module
 	BSAssign(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSAssign);
 
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c
index 9c13560ad..425e83069 100644
--- a/src/core/bs_badwords.c
+++ b/src/core/bs_badwords.c
@@ -228,7 +228,7 @@ class BSBadwords : public Module
 	BSBadwords(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSBadwords);
 
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index 09463a77b..58ae4898d 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -413,7 +413,7 @@ class BSBot : public Module
 	BSBot(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSBot());
 
diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c
index fbae61911..6a17ecf53 100644
--- a/src/core/bs_botlist.c
+++ b/src/core/bs_botlist.c
@@ -76,7 +76,7 @@ class BSBotList : public Module
 	BSBotList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSBotList());
 
diff --git a/src/core/bs_help.c b/src/core/bs_help.c
index c4b4cdbd8..730c0a4f0 100644
--- a/src/core/bs_help.c
+++ b/src/core/bs_help.c
@@ -45,7 +45,7 @@ class BSHelp : public Module
 	BSHelp(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSHelp());
 	}
diff --git a/src/core/bs_info.c b/src/core/bs_info.c
index ac4c21f92..1b9906273 100644
--- a/src/core/bs_info.c
+++ b/src/core/bs_info.c
@@ -250,7 +250,7 @@ class BSInfo : public Module
 	BSInfo(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSInfo());
 
diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c
index 7bce96b56..d24e79e2e 100644
--- a/src/core/bs_kick.c
+++ b/src/core/bs_kick.c
@@ -334,7 +334,7 @@ class BSKick : public Module
 	BSKick(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSKick());
 
diff --git a/src/core/bs_say.c b/src/core/bs_say.c
index 65fd93922..7b4685101 100644
--- a/src/core/bs_say.c
+++ b/src/core/bs_say.c
@@ -80,7 +80,7 @@ class BSSay : public Module
 	BSSay(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSSay());
 
diff --git a/src/core/bs_set.c b/src/core/bs_set.c
index 69c6612f7..4093ae54d 100644
--- a/src/core/bs_set.c
+++ b/src/core/bs_set.c
@@ -184,7 +184,7 @@ class BSSet : public Module
 	BSSet(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSSet());
 
diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c
index 0505b8ea6..5c2b2cc4d 100644
--- a/src/core/bs_unassign.c
+++ b/src/core/bs_unassign.c
@@ -62,7 +62,7 @@ class BSUnassign : public Module
 	BSUnassign(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSUnassign);
 
diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index bc68c8c58..48b25cc2a 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -571,7 +571,7 @@ class CSAccess : public Module
 	CSAccess(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(CHANSERV, new CommandCSAccess());
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index f73360769..91f3cabdd 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -576,7 +576,7 @@ class CSAKick : public Module
 	CSAKick(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSAKick());
 
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index b9d6d7520..9901c1b23 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -103,7 +103,7 @@ class CSBan : public Module
 	CSBan(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSBan("BAN"));
 		this->AddCommand(CHANSERV, new CommandCSBan("KB"));
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index 0ccc95629..b57b49b0a 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -170,7 +170,7 @@ class CSClear : public Module
 	CSClear(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSClear());
 
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c
index 4705934c7..d3b1183b4 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.c
@@ -112,7 +112,7 @@ class CSDrop : public Module
 	CSDrop(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSDrop());
 
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index ecaae1df5..3ee789f8b 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -117,7 +117,7 @@ class CSForbid : public Module
 	CSForbid(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSForbid());
 
diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c
index 85c901412..4c006694d 100644
--- a/src/core/cs_getkey.c
+++ b/src/core/cs_getkey.c
@@ -65,7 +65,7 @@ class CSGetKey : public Module
 	CSGetKey(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSGetKey());
 
diff --git a/src/core/cs_help.c b/src/core/cs_help.c
index c7be1e787..b86d5378a 100644
--- a/src/core/cs_help.c
+++ b/src/core/cs_help.c
@@ -70,7 +70,7 @@ class CSHelp : public Module
 	CSHelp(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSHelp());
 	}
diff --git a/src/core/cs_info.c b/src/core/cs_info.c
index 2a8c0b905..7b6ca9f25 100644
--- a/src/core/cs_info.c
+++ b/src/core/cs_info.c
@@ -165,7 +165,7 @@ class CSInfo : public Module
 	CSInfo(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSInfo());
 
diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c
index 4dd17a335..63d44d4e6 100644
--- a/src/core/cs_invite.c
+++ b/src/core/cs_invite.c
@@ -83,7 +83,7 @@ class CSInvite : public Module
 	CSInvite(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSInvite());
 
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c
index 7524db1bf..9a522c0f9 100644
--- a/src/core/cs_kick.c
+++ b/src/core/cs_kick.c
@@ -88,7 +88,7 @@ class CSKick : public Module
 	CSKick(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSKick("KICK"));
 		this->AddCommand(CHANSERV, new CommandCSKick("K"));
diff --git a/src/core/cs_list.c b/src/core/cs_list.c
index 3046e8873..6fb338db8 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.c
@@ -187,7 +187,7 @@ public:
 	CSList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSList());
 
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c
index 128c1fb8e..b8424d930 100644
--- a/src/core/cs_modes.c
+++ b/src/core/cs_modes.c
@@ -373,7 +373,7 @@ class CSModes : public Module
 	CSModes(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(CHANSERV, new CommandCSOp());
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index 4514ea85d..035e7d4e3 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -123,7 +123,7 @@ class CSRegister : public Module
 	CSRegister(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(CHANSERV, new CommandCSRegister());
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index 01de1007a..ef0a655c4 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -825,7 +825,7 @@ class CSSet : public Module
 	CSSet(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSSet());
 
diff --git a/src/core/cs_status.c b/src/core/cs_status.c
index 33486fd02..6314b47ff 100644
--- a/src/core/cs_status.c
+++ b/src/core/cs_status.c
@@ -64,7 +64,7 @@ class CSStatus : public Module
 	CSStatus(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(CHANSERV, new CommandCSStatus());
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index 9a3907831..1f4a6c639 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -177,7 +177,7 @@ class CSSuspend : public Module
 	CSSuspend(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(CHANSERV, new CommandCSSuspend());
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index f9896df7f..99eef8b4b 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -86,7 +86,7 @@ class CSTopic : public Module
 	CSTopic(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(CHANSERV, new CommandCSTopic());
diff --git a/src/core/cs_unban.c b/src/core/cs_unban.c
index b8a2c49af..b866bae6b 100644
--- a/src/core/cs_unban.c
+++ b/src/core/cs_unban.c
@@ -76,7 +76,7 @@ class CSUnban : public Module
 	CSUnban(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(CHANSERV, new CommandCSUnban());
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index d6dc37e90..5e3b3214a 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -538,7 +538,7 @@ class CSXOP : public Module
 	CSXOP(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(CHANSERV, new CommandCSSOP());
diff --git a/src/core/db_plain.cpp b/src/core/db_plain.cpp
index 7e699b0fb..7cc80d0b1 100644
--- a/src/core/db_plain.cpp
+++ b/src/core/db_plain.cpp
@@ -539,7 +539,7 @@ class DBPlain : public Module
 	DBPlain(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(DATABASE);
 
 		Implementation i[] = { I_OnReload, I_OnDatabaseRead, I_OnLoadDatabase, I_OnDatabaseReadMetadata, I_OnSaveDatabase, I_OnModuleLoad };
diff --git a/src/core/enc_md5.c b/src/core/enc_md5.c
index e7c90f56e..1c46ca72b 100644
--- a/src/core/enc_md5.c
+++ b/src/core/enc_md5.c
@@ -332,7 +332,7 @@ class EMD5 : public Module
 	EMD5(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(ENCRYPTION);
 
 
diff --git a/src/core/enc_none.c b/src/core/enc_none.c
index ffb6cb03d..280c86bd2 100644
--- a/src/core/enc_none.c
+++ b/src/core/enc_none.c
@@ -15,7 +15,7 @@ class ENone : public Module
 	ENone(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(ENCRYPTION);
 
 		ModuleManager::Attach(I_OnEncrypt, this);
diff --git a/src/core/enc_old.c b/src/core/enc_old.c
index 1a4e671f0..590384b55 100644
--- a/src/core/enc_old.c
+++ b/src/core/enc_old.c
@@ -331,7 +331,7 @@ class EOld : public Module
 	EOld(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(ENCRYPTION);
 
 		ModuleManager::Attach(I_OnEncrypt, this);
diff --git a/src/core/enc_sha1.c b/src/core/enc_sha1.c
index cea80b110..b4ac2a4e2 100644
--- a/src/core/enc_sha1.c
+++ b/src/core/enc_sha1.c
@@ -184,7 +184,7 @@ class ESHA1 : public Module
 	ESHA1(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(ENCRYPTION);
 
 		ModuleManager::Attach(I_OnEncrypt, this);
diff --git a/src/core/enc_sha256.c b/src/core/enc_sha256.c
index 94c7c6525..ef1ed7a00 100644
--- a/src/core/enc_sha256.c
+++ b/src/core/enc_sha256.c
@@ -270,7 +270,7 @@ class ESHA256 : public Module
 	ESHA256(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(ENCRYPTION);
 
 		ModuleManager::Attach(I_OnEncrypt, this);
diff --git a/src/core/hs_del.c b/src/core/hs_del.c
index b01debd02..73eb35617 100644
--- a/src/core/hs_del.c
+++ b/src/core/hs_del.c
@@ -61,7 +61,7 @@ class HSDel : public Module
 	HSDel(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSDel());
diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c
index 4da35c684..2bc9908fd 100644
--- a/src/core/hs_delall.c
+++ b/src/core/hs_delall.c
@@ -68,7 +68,7 @@ class HSDelAll : public Module
 	HSDelAll(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSDelAll());
diff --git a/src/core/hs_group.c b/src/core/hs_group.c
index 06b657fde..5b979acca 100644
--- a/src/core/hs_group.c
+++ b/src/core/hs_group.c
@@ -54,7 +54,7 @@ class HSGroup : public Module
 	HSGroup(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSGroup());
diff --git a/src/core/hs_help.c b/src/core/hs_help.c
index 6dadff4b7..45ac23bc5 100644
--- a/src/core/hs_help.c
+++ b/src/core/hs_help.c
@@ -42,7 +42,7 @@ class HSHelp : public Module
 	HSHelp(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSHelp());
diff --git a/src/core/hs_list.c b/src/core/hs_list.c
index e692967d9..89933c540 100644
--- a/src/core/hs_list.c
+++ b/src/core/hs_list.c
@@ -121,7 +121,7 @@ class HSList : public Module
 	HSList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSList());
diff --git a/src/core/hs_off.c b/src/core/hs_off.c
index f7a4f4505..5ec52ced3 100644
--- a/src/core/hs_off.c
+++ b/src/core/hs_off.c
@@ -50,7 +50,7 @@ class HSOff : public Module
 	HSOff(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSOff());
diff --git a/src/core/hs_on.c b/src/core/hs_on.c
index b1daf7275..3926c9780 100644
--- a/src/core/hs_on.c
+++ b/src/core/hs_on.c
@@ -64,7 +64,7 @@ class HSOn : public Module
 	HSOn(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSOn());
diff --git a/src/core/hs_set.c b/src/core/hs_set.c
index c4b9559e0..c3f00fd88 100644
--- a/src/core/hs_set.c
+++ b/src/core/hs_set.c
@@ -158,7 +158,7 @@ class HSSet : public Module
 	HSSet(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSSet());
diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c
index b15fc29ba..8d30e7149 100644
--- a/src/core/hs_setall.c
+++ b/src/core/hs_setall.c
@@ -156,7 +156,7 @@ class HSSetAll : public Module
 	HSSetAll(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSSetAll());
diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.c
index 0c5458647..132c91645 100644
--- a/src/core/ms_cancel.c
+++ b/src/core/ms_cancel.c
@@ -78,7 +78,7 @@ class MSCancel : public Module
 	MSCancel(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSCancel());
 
diff --git a/src/core/ms_check.c b/src/core/ms_check.c
index b2968c3d5..e15d18ead 100644
--- a/src/core/ms_check.c
+++ b/src/core/ms_check.c
@@ -94,7 +94,7 @@ class MSCheck : public Module
 	MSCheck(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSCheck());
 
diff --git a/src/core/ms_del.c b/src/core/ms_del.c
index 9b48ae856..22ccefbed 100644
--- a/src/core/ms_del.c
+++ b/src/core/ms_del.c
@@ -167,7 +167,7 @@ class MSDel : public Module
 	MSDel(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSDel());
 
diff --git a/src/core/ms_help.c b/src/core/ms_help.c
index 122aed874..f43133005 100644
--- a/src/core/ms_help.c
+++ b/src/core/ms_help.c
@@ -43,7 +43,7 @@ class MSHelp : public Module
 	MSHelp(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSHelp());
 	}
diff --git a/src/core/ms_info.c b/src/core/ms_info.c
index 6e835d7e6..19897a809 100644
--- a/src/core/ms_info.c
+++ b/src/core/ms_info.c
@@ -207,7 +207,7 @@ class MSInfo : public Module
 	MSInfo(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSInfo());
 
diff --git a/src/core/ms_list.c b/src/core/ms_list.c
index 81c9b767b..8f175e295 100644
--- a/src/core/ms_list.c
+++ b/src/core/ms_list.c
@@ -114,7 +114,7 @@ class MSList : public Module
 	MSList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSList());
 
diff --git a/src/core/ms_read.c b/src/core/ms_read.c
index 01093d820..38458a2d7 100644
--- a/src/core/ms_read.c
+++ b/src/core/ms_read.c
@@ -123,7 +123,7 @@ class MSRead : public Module
 	MSRead(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSRead());
 
diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c
index 71de1b1fe..78525573e 100644
--- a/src/core/ms_rsend.c
+++ b/src/core/ms_rsend.c
@@ -78,7 +78,7 @@ class MSRSend : public Module
 	MSRSend(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSRSend());
 
diff --git a/src/core/ms_send.c b/src/core/ms_send.c
index 2d5208821..d459fcc60 100644
--- a/src/core/ms_send.c
+++ b/src/core/ms_send.c
@@ -49,7 +49,7 @@ class MSSend : public Module
 	MSSend(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSSend());
 
diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c
index b5b675a3d..10d665619 100644
--- a/src/core/ms_sendall.c
+++ b/src/core/ms_sendall.c
@@ -65,7 +65,7 @@ class MSSendAll : public Module
 	MSSendAll(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSSendAll());
 
diff --git a/src/core/ms_set.c b/src/core/ms_set.c
index 81e0960da..3fbcabbe7 100644
--- a/src/core/ms_set.c
+++ b/src/core/ms_set.c
@@ -260,7 +260,7 @@ class MSSet : public Module
 	MSSet(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(MEMOSERV, new CommandMSSet());
diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c
index 4dcd1354f..b83f1347d 100644
--- a/src/core/ms_staff.c
+++ b/src/core/ms_staff.c
@@ -63,7 +63,7 @@ class MSStaff : public Module
 	MSStaff(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSStaff());
 
diff --git a/src/core/ns_access.c b/src/core/ns_access.c
index 60d4252e2..b63ffe967 100644
--- a/src/core/ns_access.c
+++ b/src/core/ns_access.c
@@ -169,7 +169,7 @@ class NSAccess : public Module
 	NSAccess(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSAccess());
diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c
index b375c126a..dcfdb66a1 100644
--- a/src/core/ns_alist.c
+++ b/src/core/ns_alist.c
@@ -145,7 +145,7 @@ class NSAList : public Module
 	NSAList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSAList());
diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c
index a4ad89239..965533402 100644
--- a/src/core/ns_drop.c
+++ b/src/core/ns_drop.c
@@ -113,7 +113,7 @@ class NSDrop : public Module
 	NSDrop(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSDrop());
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index 7ddaec68a..3b3afe7f9 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -106,7 +106,7 @@ class NSForbid : public Module
 	NSForbid(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSForbid());
diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.c
index ab83936e4..0165bb289 100644
--- a/src/core/ns_getemail.c
+++ b/src/core/ns_getemail.c
@@ -74,7 +74,7 @@ class NSGetEMail : public Module
 	NSGetEMail(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSGetEMail());
diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c
index 367131ab3..17cc2bfb4 100644
--- a/src/core/ns_getpass.c
+++ b/src/core/ns_getpass.c
@@ -78,7 +78,7 @@ class NSGetPass : public Module
 	NSGetPass(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSGetPass());
diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c
index 28609b2d3..9aa44a625 100644
--- a/src/core/ns_ghost.c
+++ b/src/core/ns_ghost.c
@@ -91,7 +91,7 @@ class NSGhost : public Module
 	NSGhost(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSGhost());
diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index ce88641fe..d27aa1f9c 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -217,7 +217,7 @@ class NSGroup : public Module
 	NSGroup(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSGroup());
diff --git a/src/core/ns_help.c b/src/core/ns_help.c
index 64db11e8d..e79076b04 100644
--- a/src/core/ns_help.c
+++ b/src/core/ns_help.c
@@ -58,7 +58,7 @@ class NSHelp : public Module
 	NSHelp(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSHelp());
diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c
index 1b829179c..5a7b2f2f2 100644
--- a/src/core/ns_identify.c
+++ b/src/core/ns_identify.c
@@ -113,7 +113,7 @@ class NSIdentify : public Module
 	NSIdentify(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSIdentify("IDENTIFY"));
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index beb61905a..69e2f09e9 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -209,7 +209,7 @@ class NSInfo : public Module
 	NSInfo(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSInfo());
diff --git a/src/core/ns_list.c b/src/core/ns_list.c
index b0d90f8b6..0072205d0 100644
--- a/src/core/ns_list.c
+++ b/src/core/ns_list.c
@@ -218,7 +218,7 @@ class NSList : public Module
 	NSList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSList());
diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c
index 7e16dc8f5..35a07b074 100644
--- a/src/core/ns_logout.c
+++ b/src/core/ns_logout.c
@@ -86,7 +86,7 @@ class NSLogout : public Module
 	NSLogout(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSLogout());
diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c
index 99b5e34f1..2a8289c6c 100644
--- a/src/core/ns_recover.c
+++ b/src/core/ns_recover.c
@@ -112,7 +112,7 @@ class NSRecover : public Module
 	NSRecover(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSRecover());
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index 12c811f1c..348126437 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -367,7 +367,7 @@ class NSRegister : public Module
 	NSRegister(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSRegister());
diff --git a/src/core/ns_release.c b/src/core/ns_release.c
index 6f360e942..e04b908c2 100644
--- a/src/core/ns_release.c
+++ b/src/core/ns_release.c
@@ -94,7 +94,7 @@ class NSRelease : public Module
 	NSRelease(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSRelease());
diff --git a/src/core/ns_resetpass.c b/src/core/ns_resetpass.c
index 258b8c4b5..d384a0801 100644
--- a/src/core/ns_resetpass.c
+++ b/src/core/ns_resetpass.c
@@ -92,7 +92,7 @@ class NSResetPass : public Module
 	NSResetPass(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		if (!Config.UseMail)
diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c
index 85167c748..e62f89ef7 100644
--- a/src/core/ns_saset.c
+++ b/src/core/ns_saset.c
@@ -584,7 +584,7 @@ public:
 	NSSASet(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSSASet());
diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c
index 5cab1b367..099b03ff8 100644
--- a/src/core/ns_sendpass.c
+++ b/src/core/ns_sendpass.c
@@ -89,7 +89,7 @@ class NSSendPass : public Module
 	NSSendPass(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSSendPass());
diff --git a/src/core/ns_set.c b/src/core/ns_set.c
index 6bbe5c2e4..50722f2e1 100644
--- a/src/core/ns_set.c
+++ b/src/core/ns_set.c
@@ -542,7 +542,7 @@ class NSSet : public Module
 	NSSet(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSSet());
diff --git a/src/core/ns_status.c b/src/core/ns_status.c
index df1e52f98..4b197be56 100644
--- a/src/core/ns_status.c
+++ b/src/core/ns_status.c
@@ -65,7 +65,7 @@ class NSStatus : public Module
 	NSStatus(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSStatus());
diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c
index 2354fe66b..5285550cb 100644
--- a/src/core/ns_suspend.c
+++ b/src/core/ns_suspend.c
@@ -181,7 +181,7 @@ class NSSuspend : public Module
 	NSSuspend(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSSuspend());
diff --git a/src/core/ns_update.c b/src/core/ns_update.c
index 0650487f9..32f75e7a7 100644
--- a/src/core/ns_update.c
+++ b/src/core/ns_update.c
@@ -55,7 +55,7 @@ class NSUpdate : public Module
 	NSUpdate(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(NICKSERV, new CommandNSUpdate());
 		ModuleManager::Attach(I_OnNickServHelp, this);
diff --git a/src/core/os_akill.c b/src/core/os_akill.c
index 5b987b7c3..2b372b215 100644
--- a/src/core/os_akill.c
+++ b/src/core/os_akill.c
@@ -333,7 +333,7 @@ class OSAKill : public Module
 	OSAKill(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(OPERSERV, new CommandOSAKill());
 
diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c
index 2920e0b4d..c64e71eec 100644
--- a/src/core/os_chankill.c
+++ b/src/core/os_chankill.c
@@ -111,7 +111,7 @@ class OSChanKill : public Module
 	OSChanKill(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSChanKill());
diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c
index e8faa10f7..33c533a01 100644
--- a/src/core/os_chanlist.c
+++ b/src/core/os_chanlist.c
@@ -98,7 +98,7 @@ class OSChanList : public Module
 	OSChanList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSChanList());
diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c
index f52cd12ae..49bb4801e 100644
--- a/src/core/os_clearmodes.c
+++ b/src/core/os_clearmodes.c
@@ -175,7 +175,7 @@ class OSClearModes : public Module
 	OSClearModes(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSClearModes());
diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c
index 96b945a97..921740d98 100644
--- a/src/core/os_defcon.c
+++ b/src/core/os_defcon.c
@@ -134,7 +134,7 @@ class OSDEFCON : public Module
 	OSDEFCON(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		if (!Config.DefConLevel)
diff --git a/src/core/os_global.c b/src/core/os_global.c
index 89261ddeb..9c3fb5602 100644
--- a/src/core/os_global.c
+++ b/src/core/os_global.c
@@ -50,7 +50,7 @@ class OSGlobal : public Module
 	OSGlobal(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSGlobal());
diff --git a/src/core/os_help.c b/src/core/os_help.c
index 852f510d0..99766c832 100644
--- a/src/core/os_help.c
+++ b/src/core/os_help.c
@@ -42,7 +42,7 @@ class OSHelp : public Module
 	OSHelp(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(OPERSERV, new CommandOSHelp());
 	}
diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c
index 2519cde96..0b1e0801c 100644
--- a/src/core/os_ignore.c
+++ b/src/core/os_ignore.c
@@ -136,7 +136,7 @@ class OSIgnore : public Module
 	OSIgnore(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(OPERSERV, new CommandOSIgnore());
 
diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c
index 3184ec6f4..953925a5d 100644
--- a/src/core/os_jupe.c
+++ b/src/core/os_jupe.c
@@ -64,7 +64,7 @@ class OSJupe : public Module
 	OSJupe(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSJupe());
diff --git a/src/core/os_kick.c b/src/core/os_kick.c
index 43a676997..8e80bcf35 100644
--- a/src/core/os_kick.c
+++ b/src/core/os_kick.c
@@ -68,7 +68,7 @@ class OSKick : public Module
 	OSKick(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSKick());
diff --git a/src/core/os_mode.c b/src/core/os_mode.c
index 3e88f8c6a..ae84f1653 100644
--- a/src/core/os_mode.c
+++ b/src/core/os_mode.c
@@ -59,7 +59,7 @@ class OSMode : public Module
 	OSMode(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSMode());
diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.c
index 6137d405d..a43f798d4 100644
--- a/src/core/os_modinfo.c
+++ b/src/core/os_modinfo.c
@@ -71,7 +71,7 @@ class OSModInfo : public Module
 	OSModInfo(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(OPERSERV, new CommandOSModInfo());
 
diff --git a/src/core/os_modlist.c b/src/core/os_modlist.c
index cf40e8711..23fff2d22 100644
--- a/src/core/os_modlist.c
+++ b/src/core/os_modlist.c
@@ -199,7 +199,7 @@ class OSModList : public Module
 	OSModList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSModList());
diff --git a/src/core/os_modload.c b/src/core/os_modload.c
index eeb3576c8..0d7d7642d 100644
--- a/src/core/os_modload.c
+++ b/src/core/os_modload.c
@@ -60,7 +60,7 @@ class OSModLoad : public Module
 	OSModLoad(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->SetPermanent(true);
 
diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c
index bf720c971..1130ad676 100644
--- a/src/core/os_modunload.c
+++ b/src/core/os_modunload.c
@@ -62,7 +62,7 @@ class OSModUnLoad : public Module
 	OSModUnLoad(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->SetPermanent(true);
 
diff --git a/src/core/os_news.c b/src/core/os_news.c
index 69d0fa808..2b8448491 100644
--- a/src/core/os_news.c
+++ b/src/core/os_news.c
@@ -394,7 +394,7 @@ class OSNews : public Module
 	OSNews(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSLogonNews());
diff --git a/src/core/os_noop.c b/src/core/os_noop.c
index b08b2f145..74529be8b 100644
--- a/src/core/os_noop.c
+++ b/src/core/os_noop.c
@@ -77,7 +77,7 @@ class OSNOOP : public Module
 	OSNOOP(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSNOOP());
diff --git a/src/core/os_oline.c b/src/core/os_oline.c
index 4e3815f64..29b0f99d3 100644
--- a/src/core/os_oline.c
+++ b/src/core/os_oline.c
@@ -68,7 +68,7 @@ class OSOLine : public Module
 	OSOLine(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSOLine());
diff --git a/src/core/os_quit.c b/src/core/os_quit.c
index 4309ac036..4eab884e1 100644
--- a/src/core/os_quit.c
+++ b/src/core/os_quit.c
@@ -50,7 +50,7 @@ class OSQuit : public Module
 	OSQuit(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSQuit());
diff --git a/src/core/os_reload.c b/src/core/os_reload.c
index b3fd824b5..168dc85c7 100644
--- a/src/core/os_reload.c
+++ b/src/core/os_reload.c
@@ -52,7 +52,7 @@ class OSReload : public Module
 	OSReload(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSReload());
diff --git a/src/core/os_restart.c b/src/core/os_restart.c
index fb356b698..13ba6ed0a 100644
--- a/src/core/os_restart.c
+++ b/src/core/os_restart.c
@@ -50,7 +50,7 @@ class OSRestart : public Module
 	OSRestart(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(OPERSERV, new CommandOSRestart());
 
diff --git a/src/core/os_session.c b/src/core/os_session.c
index 5df784dd7..03a5da032 100644
--- a/src/core/os_session.c
+++ b/src/core/os_session.c
@@ -458,7 +458,7 @@ class OSSession : public Module
 	OSSession(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSSession());
diff --git a/src/core/os_set.c b/src/core/os_set.c
index 7be3a67f0..dd880b8d3 100644
--- a/src/core/os_set.c
+++ b/src/core/os_set.c
@@ -296,7 +296,7 @@ class OSSet : public Module
 	OSSet(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSSet());
diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c
index 39f62c16d..c121acb9a 100644
--- a/src/core/os_sgline.c
+++ b/src/core/os_sgline.c
@@ -334,7 +334,7 @@ class OSSGLine : public Module
 	{
 
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSSGLine());
diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c
index 3adc2638f..d081b927a 100644
--- a/src/core/os_shutdown.c
+++ b/src/core/os_shutdown.c
@@ -50,7 +50,7 @@ class OSShutdown : public Module
 	OSShutdown(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSShutdown());
diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c
index c93557ca4..1c2b47b07 100644
--- a/src/core/os_sqline.c
+++ b/src/core/os_sqline.c
@@ -320,7 +320,7 @@ class OSSQLine : public Module
 	OSSQLine(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSSQLine());
diff --git a/src/core/os_staff.c b/src/core/os_staff.c
index 39828f520..83c013b6d 100644
--- a/src/core/os_staff.c
+++ b/src/core/os_staff.c
@@ -70,7 +70,7 @@ class OSStaff : public Module
 	OSStaff(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSStaff());
diff --git a/src/core/os_stats.c b/src/core/os_stats.c
index f159c4806..9e3249784 100644
--- a/src/core/os_stats.c
+++ b/src/core/os_stats.c
@@ -299,7 +299,7 @@ class OSStats : public Module
 	OSStats(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSStats());
diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c
index 48167d8d8..eb70ec53b 100644
--- a/src/core/os_svsnick.c
+++ b/src/core/os_svsnick.c
@@ -86,7 +86,7 @@ class OSSVSNick : public Module
 	OSSVSNick(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSSVSNick());
diff --git a/src/core/os_szline.c b/src/core/os_szline.c
index c50ba7334..cdd38dbef 100644
--- a/src/core/os_szline.c
+++ b/src/core/os_szline.c
@@ -319,7 +319,7 @@ class OSSZLine : public Module
 	OSSZLine(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSSZLine());
diff --git a/src/core/os_umode.c b/src/core/os_umode.c
index 2f3cfa1bd..0523ad503 100644
--- a/src/core/os_umode.c
+++ b/src/core/os_umode.c
@@ -71,7 +71,7 @@ class OSUMode : public Module
 	OSUMode(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSUMode());
diff --git a/src/core/os_update.c b/src/core/os_update.c
index 6490618e4..60905c3fe 100644
--- a/src/core/os_update.c
+++ b/src/core/os_update.c
@@ -42,7 +42,7 @@ class OSUpdate : public Module
 	OSUpdate(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSUpdate());
diff --git a/src/core/os_userlist.c b/src/core/os_userlist.c
index 331818bec..ba1075d28 100644
--- a/src/core/os_userlist.c
+++ b/src/core/os_userlist.c
@@ -102,7 +102,7 @@ class OSUserList : public Module
 	OSUserList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSUserList());
diff --git a/src/core/ss_main.c b/src/core/ss_main.c
index 6405c8858..9c8e4ed34 100644
--- a/src/core/ss_main.c
+++ b/src/core/ss_main.c
@@ -37,7 +37,7 @@ class SSMain : public Module
 	SSMain(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->SetPermanent(true);
 
diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c
index e94b23476..22848b74a 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 2173c50ab..435f07d79 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
 
 #define LNG_NUM_STRINGS	6
 
diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c
index 46c678522..10f295b3d 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 mySendResponse(User *u, const char *channel, char *mask, const char *time);
 
diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c
index fdacc91a2..ebc46dfe8 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 4a90b7da6..e98dc62d7 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 my_add_languages();
diff --git a/src/modules/os_info.c b/src/modules/os_info.c
index c225df65d..87d8ea298 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
 
 /* Multi-language stuff */
 #define LANG_NUM_STRINGS   10
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index e0aa334f1..1e38a4aa2 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -812,7 +812,7 @@ class ProtoBahamut : public Module
 	ProtoBahamut(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		pmodule_ircd_version("BahamutIRCd 1.4.*/1.8.*");
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index e9e28189e..b5c55cfa8 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1168,7 +1168,7 @@ class ProtoInspIRCd : public Module
 	ProtoInspIRCd(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		pmodule_ircd_version("inspircdIRCd 1.1");
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index ffdc12448..4ad390f00 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -1383,7 +1383,7 @@ class ProtoInspIRCd : public Module
 	ProtoInspIRCd(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		if (Config.Numeric)
diff --git a/src/protocol/inspircd20.cpp b/src/protocol/inspircd20.cpp
index 985fb5381..4b37e8c1c 100644
--- a/src/protocol/inspircd20.cpp
+++ b/src/protocol/inspircd20.cpp
@@ -1382,7 +1382,7 @@ class ProtoInspIRCd : public Module
 	ProtoInspIRCd(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		if (Config.Numeric)
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 24f238be5..8d0a84826 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -877,7 +877,7 @@ class ProtoRatbox : public Module
 	ProtoRatbox(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		if (Config.Numeric)
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 3eb24cc62..3564fecd6 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1333,7 +1333,7 @@ class ProtoUnreal : public Module
 	ProtoUnreal(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
+		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		pmodule_ircd_version("UnrealIRCd 3.2+");