diff --git a/amxmodx/amxmodx.cpp b/amxmodx/amxmodx.cpp
index 55078e8e..0d7620c0 100755
--- a/amxmodx/amxmodx.cpp
+++ b/amxmodx/amxmodx.cpp
@@ -37,6 +37,7 @@
 #include "libraries.h"
 #include "CFlagManager.h"
 #include "nongpl_matches.h"
+#include "svn_version.h"
 
 extern CFlagManager FlagMan;
 CVector<CAdminData *> DynamicAdmins;
@@ -593,7 +594,7 @@ static cell AMX_NATIVE_CALL is_user_alive(AMX *amx, cell *params) /* 1 param */
 
 static cell AMX_NATIVE_CALL get_amxx_verstring(AMX *amx, cell *params) /* 2 params */
 {
-	return set_amxstring(amx, params[1], AMX_VERSION, params[2]);
+	return set_amxstring(amx, params[1], SVN_VERSION_STRING, params[2]);
 }
 
 static cell AMX_NATIVE_CALL get_user_frags(AMX *amx, cell *params) /* 1 param */
diff --git a/amxmodx/amxmodx.h b/amxmodx/amxmodx.h
index 5e5093b2..12be564b 100755
--- a/amxmodx/amxmodx.h
+++ b/amxmodx/amxmodx.h
@@ -73,7 +73,6 @@
 
 #define AMXXLOG_Log g_log.Log
 #define AMXXLOG_Error g_log.LogError
-#define AMX_VERSION	"1.76d"
 
 extern AMX_NATIVE_INFO core_Natives[];
 extern AMX_NATIVE_INFO time_Natives[];
diff --git a/amxmodx/amxxlog.cpp b/amxmodx/amxxlog.cpp
index 7659d57b..18b76d32 100755
--- a/amxmodx/amxxlog.cpp
+++ b/amxmodx/amxxlog.cpp
@@ -44,6 +44,8 @@
 	#define	vsnprintf	_vsnprintf
 #endif
 
+#include "svn_version.h"
+
 CLog::CLog()
 {
 	m_LogType = 0;
@@ -118,7 +120,7 @@ void CLog::CreateNewFile()
 		ALERT(at_logged, "[AMXX] Unexpected fatal logging error. AMXX Logging disabled.\n");
 		SET_LOCALINFO("amxx_logging", "0");
 	} else {
-		fprintf(fp, "AMX Mod X log file started (file \"%s/L%02d%02d%03d.log\") (version \"%s\")\n", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday, i, AMX_VERSION);
+		fprintf(fp, "AMX Mod X log file started (file \"%s/L%02d%02d%03d.log\") (version \"%s\")\n", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday, i, SVN_VERSION_STRING);
 		fclose(fp);
 	}
 }
diff --git a/amxmodx/meta_api.cpp b/amxmodx/meta_api.cpp
index 38fafc90..5d41705a 100755
--- a/amxmodx/meta_api.cpp
+++ b/amxmodx/meta_api.cpp
@@ -48,13 +48,14 @@
 #include "amxmod_compat.h"
 
 #include "CFlagManager.h"
+#include "svn_version.h"
 
 
 plugin_info_t Plugin_info = 
 {
 	META_INTERFACE_VERSION,		// ifvers
 	"AMX Mod X",				// name
-	AMX_VERSION,				// version
+	SVN_VERSION_STRING,			// version
 	__DATE__,					// date
 	"AMX Mod X Dev Team",		// author
 	"http://www.amxmodx.org",	// url
@@ -430,7 +431,7 @@ int	C_Spawn(edict_t *pent)
 	int loaded = countModules(CountModules_Running); // Call after attachModules so all modules don't have pending stat
 	
 	// Set some info about amx version and modules
-	CVAR_SET_STRING(init_amxmodx_version.name, AMX_VERSION);
+	CVAR_SET_STRING(init_amxmodx_version.name, SVN_VERSION_STRING);
 	char buffer[32];
 	sprintf(buffer, "%d", loaded);
 	CVAR_SET_STRING(init_amxmodx_modules.name, buffer);
@@ -1421,7 +1422,7 @@ C_DLLEXPORT	int	Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
 
 	// ###### Print short GPL
 	print_srvconsole("\n   AMX Mod X version %s Copyright (c) 2004-2006 AMX Mod X Development Team \n"
-					 "   AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", AMX_VERSION);
+					 "   AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", SVN_VERSION_STRING);
 	print_srvconsole("   This is free software and you are welcome to redistribute it under \n"
 					 "   certain conditions; type 'amxx gpl' for details.\n  \n");
 
diff --git a/amxmodx/msvc/amxmodx_mm.vcproj b/amxmodx/msvc/amxmodx_mm.vcproj
index d9587091..a8db48ce 100755
--- a/amxmodx/msvc/amxmodx_mm.vcproj
+++ b/amxmodx/msvc/amxmodx_mm.vcproj
@@ -608,6 +608,9 @@
 			<File
 				RelativePath="..\sh_tinyhash.h">
 			</File>
+			<File
+				RelativePath="..\svn_version.h">
+			</File>
 			<File
 				RelativePath="..\zlib\zconf.h">
 			</File>
@@ -618,6 +621,9 @@
 		<Filter
 			Name="Resource Files"
 			Filter="rc">
+			<File
+				RelativePath="..\svn_version.tpl">
+			</File>
 			<File
 				RelativePath="..\version.rc">
 			</File>
diff --git a/amxmodx/nongpl_matches.cpp b/amxmodx/nongpl_matches.cpp
index 6e94a32b..b79267d3 100644
--- a/amxmodx/nongpl_matches.cpp
+++ b/amxmodx/nongpl_matches.cpp
@@ -4,6 +4,7 @@
 NONGPL_PLUGIN_T NONGPL_PLUGIN_LIST[] = 
 {
 	{"Live", "CZ Gun Game", "czgungame.amxx"},
+	{"Live", "AMXX Gun Game", "czgungame.amxx"},
 	{NULL, NULL, NULL},
 };
 
diff --git a/amxmodx/svn_version.h b/amxmodx/svn_version.h
new file mode 100644
index 00000000..9b473274
--- /dev/null
+++ b/amxmodx/svn_version.h
@@ -0,0 +1,8 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+#define SVN_VERSION_STRING		"1.8.0.3398"
+#define SVN_VERSION_DWORD		1,8,0,3398
+#define SVN_VERSION_PRODUCT		"1.8.0"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/amxmodx/version.rc b/amxmodx/version.rc
index e4f227df..bdba2287 100755
--- a/amxmodx/version.rc
+++ b/amxmodx/version.rc
@@ -8,6 +8,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "winres.h"
+#include "svn_version.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -27,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,7,6,3387
- PRODUCTVERSION 1,7,6,3387
+ FILEVERSION SVN_VERSION_DWORD
+ PRODUCTVERSION SVN_VERSION_DWORD
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -45,12 +46,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "AMX Mod X"
             VALUE "FileDescription", "AMX Mod X"
-            VALUE "FileVersion", "1.76d"
+            VALUE "FileVersion", SVN_VERSION_STRING
             VALUE "InternalName", "amxmodx"
-            VALUE "LegalCopyright", "Copyright (c) 2004-2006, AMX Mod X Dev Team"
+            VALUE "LegalCopyright", "Copyright (c) 2004-2007, AMX Mod X Dev Team"
             VALUE "OriginalFilename", "amxmodx_mm.dll"
             VALUE "ProductName", "AMX Mod X"
-            VALUE "ProductVersion", "1.76d"
+            VALUE "ProductVersion", SVN_VERSION_PRODUCT
         END
     END
     BLOCK "VarFileInfo"
diff --git a/dlls/cstrike/cstrike.sln b/dlls/cstrike/cstrike.sln
new file mode 100644
index 00000000..c486de5e
--- /dev/null
+++ b/dlls/cstrike/cstrike.sln
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cstrike", "cstrike.vcproj", "{AB148B92-4F47-42E6-8268-AB4E588EC6A2}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Debug.ActiveCfg = Debug|Win32
+		{AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Debug.Build.0 = Debug|Win32
+		{AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Release.ActiveCfg = Release|Win32
+		{AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/dlls/cstrike/moduleconfig.h b/dlls/cstrike/moduleconfig.h
index 25e039da..172df546 100755
--- a/dlls/cstrike/moduleconfig.h
+++ b/dlls/cstrike/moduleconfig.h
@@ -3,9 +3,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
+#include "svn_version.h"
+
 // Module info
 #define MODULE_NAME "CStrike"
-#define MODULE_VERSION "1.76"
+#define MODULE_VERSION SVN_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "CSTRIKE"
diff --git a/dlls/cstrike/svn_version.h b/dlls/cstrike/svn_version.h
new file mode 100644
index 00000000..64c9de4c
--- /dev/null
+++ b/dlls/cstrike/svn_version.h
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"1.8.0.3047"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/cstrike/svn_version.tpl b/dlls/cstrike/svn_version.tpl
new file mode 100644
index 00000000..bf1d0d23
--- /dev/null
+++ b/dlls/cstrike/svn_version.tpl
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/csx/plugins/tp/amx_csx_gasnades.sma b/dlls/csx/plugins/tp/amx_csx_gasnades.sma
deleted file mode 100755
index f3e43bf4..00000000
--- a/dlls/csx/plugins/tp/amx_csx_gasnades.sma
+++ /dev/null
@@ -1,177 +0,0 @@
-/* Gasnades */
-
-#include <amxmodx>
-#include <fun>
-#include <engine>
-#include <csx>
-
-new g_Gas
-//----------------------------------------------------------------------------------------------
-public plugin_init()
-{
-	register_plugin("Gasgrenades", "1.3 (CSX)", "RichoDemus/AssKicR/T(+)rget")
-
-	register_cvar("amx_gasnades", "1")
-	register_cvar("amx_gasdmg", "10")
-	register_cvar("amx_gascheck", "3")
-	register_cvar("amx_gasradius", "200")
-	register_cvar("amx_smokegasp", "1")
-	register_cvar("amx_gasobeyFF", "1")
-
-	g_Gas = custom_weapon_add("gasnade",0,"gasnade")
-}
-//----------------------------------------------------------------------------------------------
-public plugin_precache()
-{ 
-   precache_sound("player/gasp1.wav")
-   precache_sound("player/gasp2.wav")
-}
-
-public gas(par[])
-{ 
-	new grenadeid = par[1]
-	new id = par[0]
-
-	if ( !is_valid_ent(grenadeid) )
-		return
-
-	new player[3], inum, Float:temp_grenade[3], grenade[3], players[32]
-	if(get_cvar_num("amx_gasobeyFF") != 1)
-		get_players(players, inum) // Get number of players
-	else{
-		new FFOn = get_cvar_num("mp_friendlyfire")
-		if(FFOn == 0){
-			new team[33]
-			get_user_team(id, team, 32)
-			if(equali(team, "CT"))
-				get_players(players, inum, "ae", "TERRORIST")
-			else
-				get_players(players, inum, "ae", "CT")
-		}
-		else
-			get_players(players, inum) // Get number of players
-	}
-	entity_get_vector(grenadeid, EV_VEC_origin, temp_grenade) // Get the position of the grenade
-	grenade[0] = floatround(temp_grenade[0])
-	grenade[1] = floatround(temp_grenade[1])
-	grenade[2] = floatround(temp_grenade[2])
-	for(new i = 0; i < inum; ++i){ // Loop through all players
-		get_user_origin(players[i],player,0)
-		new distance = get_distance(grenade, player)
-
-		if((distance < get_cvar_num("amx_gasradius"))){ // Check who is standing close
-			if(get_cvar_num("amx_smokegasp") != 0){
-				if(get_cvar_num("amx_gascheck") >= 1){
-					new number = random_num(1, 2)
-					if(is_user_alive(players[i])){
-						switch (number){
-							case 1:emit_sound(players[i], CHAN_VOICE, "player/gasp1.wav", 1.0, ATTN_NORM, 0, PITCH_NORM)
-							case 2:emit_sound(players[i], CHAN_VOICE, "player/gasp2.wav", 1.0, ATTN_NORM, 0, PITCH_NORM)
-						}
-					}
-				}
-			}
-			message_begin(MSG_ONE, get_user_msgid("Damage"), {0,0,0}, players[i])
-			write_byte(30) // dmg_save
-			write_byte(30) // dmg_take
-			write_long((1 << 16)) // visibleDamageBits
-			write_coord(grenade[0]) // damageOrigin.x
-			write_coord(grenade[1]) // damageOrigin.y
-			write_coord(grenade[2]) // damageOrigin.z
-			message_end()
-			if(is_user_alive(id))
-				ExtraDamage(players[i], id, get_cvar_num("amx_gasdmg"), "gasgrenade")
-		}
-	}
-	set_task(get_cvar_float("amx_gascheck"), "gas",grenadeid,par,2) // If the grenade still exists we do a new check in get_cvar_num("amx_gascheck") second
-}
-//----------------------------------------------------------------------------------------------
-public grenade_throw(index,greindex,wId){
-	if ( task_exists(greindex) )
-		remove_task(greindex)
-	if( get_cvar_num("amx_gasnades") !=1 || wId != CSW_SMOKEGRENADE )
-		return PLUGIN_CONTINUE
-	if (g_Gas) custom_weapon_shot(g_Gas,index)
-	new par[2]
-	par[0] = index
-	par[1] = greindex
-	set_task(1.5, "gas", greindex,par,2)
-	return PLUGIN_CONTINUE
-}
-//----------------------------------------------------------------------------------------------
-stock ExtraDamage(id, attacker, damage, weaponDescription[])
-{
-	if(is_user_alive(id)) 
-	{
-		new userHealth = get_user_health(id)
-		set_user_health(id, userHealth - damage)
-		if (g_Gas)
-			custom_weapon_dmg(g_Gas,attacker,id,damage)
-
-		if(userHealth - damage <= 0)
-		{
-			logKill(attacker, id, weaponDescription)
-			if(get_user_team(id) != get_user_team(attacker))
-			{
-				// The person dying shouldn't get negative credit for this kill (so add it back)
-				set_user_frags(id, get_user_frags(id) + 1)
-				// The killing should get credit for the frag
-				set_user_frags(attacker, get_user_frags(attacker) + 1)
-			}
-			else
-			{
-				// The person dying shouldn't get negative credit for this kill (so add it back)
-				set_user_frags(id, get_user_frags(id) + 1)
-				// The killer killed a teammember or self
-				// Engine gives credit for the kill so let's take away that + 1
-				set_user_frags(attacker, get_user_frags(attacker) - 2)
-			}
-		}else{
-			if(get_cvar_num("mp_logdetail") == 3){
-				logDmg(attacker, id, weaponDescription,"body",damage,userHealth-damage)
-			}
-		}
-	}
-}
-//----------------------------------------------------------------------------------------------
-/* Log a kill using standard HL-logging format */
-stock logKill(attacker, victim, weaponDescription[])
-{
-	// Save Hummiliation
-	new namea[24], namev[24], authida[20], authidv[20], teama[10], teamv[10]
-
-	// Info On Attacker
-	get_user_name(attacker, namea, 23)
-	get_user_team(attacker, teama, 9)
-	get_user_authid(attacker, authida, 19)
-	// Info On Victim
-	get_user_name(victim, namev, 23)
-	get_user_team(victim, teamv, 9)
-	get_user_authid(victim, authidv, 19)
-	// Log This Kill
-	log_message("^"%s<%d><%s><%s>^" killed ^"%s<%d><%s><%s>^" with ^"%s^"",
-	namea, get_user_userid(attacker), authida, teama, namev, get_user_userid(victim), authidv, teamv, weaponDescription)
-}
-
-/* Log damage using standard HL-logging format */
-stock logDmg(attacker, victim, weaponDescription[],hit[],damage,health)
-{
-	// Save Hummiliation
-	new namea[24], namev[24], authida[20], authidv[20], teama[10], teamv[10]
-
-	// Info On Attacker
-	get_user_name(attacker, namea, 23)
-	get_user_team(attacker, teama, 9)
-	get_user_authid(attacker, authida, 19)
-	// Info On Victim
-	get_user_name(victim, namev, 23)
-	get_user_team(victim, teamv, 9)
-	get_user_authid(victim, authidv, 19)
-	// Log This Damage
-	log_message("^"%s<%d><%s><%s>^" attacked ^"%s<%d><%s><%s>^" with ^"%s^" (hit ^"%s^") (damage ^"%d^") (health ^"%d^")",
-	namea,get_user_userid(attacker),authida,teama,namev,get_user_userid(victim),authidv,teamv,weaponDescription,hit,damage,health)
-}
-
-
-
-//----------------------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/dlls/csx/source/moduleconfig.h b/dlls/csx/source/moduleconfig.h
index 40024f72..2fa954a6 100755
--- a/dlls/csx/source/moduleconfig.h
+++ b/dlls/csx/source/moduleconfig.h
@@ -3,9 +3,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
+#include "svn_version.h"
+
 // Module info
 #define MODULE_NAME "CSX"
-#define MODULE_VERSION "1.76c"
+#define MODULE_VERSION SVN_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "CSX"
diff --git a/dlls/csx/source/svn_version.h b/dlls/csx/source/svn_version.h
new file mode 100644
index 00000000..da4c2515
--- /dev/null
+++ b/dlls/csx/source/svn_version.h
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"1.8.0.3186"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/csx/source/svn_version.tpl b/dlls/csx/source/svn_version.tpl
new file mode 100644
index 00000000..bf1d0d23
--- /dev/null
+++ b/dlls/csx/source/svn_version.tpl
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/dod2/dodfun/moduleconfig.h b/dlls/dod2/dodfun/moduleconfig.h
index 5e00afba..2fb9a255 100755
--- a/dlls/dod2/dodfun/moduleconfig.h
+++ b/dlls/dod2/dodfun/moduleconfig.h
@@ -3,9 +3,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
+#include "svn_version.h"
+
 // Module info
 #define MODULE_NAME "DoD Fun"
-#define MODULE_VERSION "1.76c_beta_a"
+#define MODULE_VERSION SVN_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "DODFUN"
diff --git a/dlls/dod2/dodfun/svn_version.h b/dlls/dod2/dodfun/svn_version.h
new file mode 100644
index 00000000..143f5e53
--- /dev/null
+++ b/dlls/dod2/dodfun/svn_version.h
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"1.8.0.3392"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/dod2/dodfun/svn_version.tpl b/dlls/dod2/dodfun/svn_version.tpl
new file mode 100644
index 00000000..bf1d0d23
--- /dev/null
+++ b/dlls/dod2/dodfun/svn_version.tpl
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/dod2/dodx/moduleconfig.h b/dlls/dod2/dodx/moduleconfig.h
index d965b103..ba3a5701 100755
--- a/dlls/dod2/dodx/moduleconfig.h
+++ b/dlls/dod2/dodx/moduleconfig.h
@@ -3,9 +3,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
+#include "svn_version.h"
+
 // Module info
 #define MODULE_NAME "DoDX"
-#define MODULE_VERSION "1.76c_beta_6"
+#define MODULE_VERSION SVN_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "DODX"
diff --git a/dlls/dod2/dodx/svn_version.h b/dlls/dod2/dodx/svn_version.h
new file mode 100644
index 00000000..143f5e53
--- /dev/null
+++ b/dlls/dod2/dodx/svn_version.h
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"1.8.0.3392"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/dod2/dodx/svn_version.tpl b/dlls/dod2/dodx/svn_version.tpl
new file mode 100644
index 00000000..bf1d0d23
--- /dev/null
+++ b/dlls/dod2/dodx/svn_version.tpl
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/engine/moduleconfig.h b/dlls/engine/moduleconfig.h
index f3164a21..e52c3e1d 100755
--- a/dlls/engine/moduleconfig.h
+++ b/dlls/engine/moduleconfig.h
@@ -3,9 +3,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
+#include "svn_version.h"
+
 // Module info
 #define MODULE_NAME "Engine"
-#define MODULE_VERSION "1.76"
+#define MODULE_VERSION SVN_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "ENGINE"
diff --git a/dlls/engine/svn_version.h b/dlls/engine/svn_version.h
new file mode 100644
index 00000000..9f157337
--- /dev/null
+++ b/dlls/engine/svn_version.h
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"1.8.0.3397"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/engine/svn_version.tpl b/dlls/engine/svn_version.tpl
new file mode 100644
index 00000000..bf1d0d23
--- /dev/null
+++ b/dlls/engine/svn_version.tpl
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/fakemeta/fakemeta.sln b/dlls/fakemeta/fakemeta.sln
new file mode 100644
index 00000000..a2143411
--- /dev/null
+++ b/dlls/fakemeta/fakemeta.sln
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fakemeta", "fakemeta.vcproj", "{5E393C37-22F2-4CA2-9022-6400DC582447}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{5E393C37-22F2-4CA2-9022-6400DC582447}.Debug.ActiveCfg = Debug|Win32
+		{5E393C37-22F2-4CA2-9022-6400DC582447}.Debug.Build.0 = Debug|Win32
+		{5E393C37-22F2-4CA2-9022-6400DC582447}.Release.ActiveCfg = Release|Win32
+		{5E393C37-22F2-4CA2-9022-6400DC582447}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/dlls/fakemeta/sdk/moduleconfig.h b/dlls/fakemeta/sdk/moduleconfig.h
index 61d6c9e7..5f794cf5 100755
--- a/dlls/fakemeta/sdk/moduleconfig.h
+++ b/dlls/fakemeta/sdk/moduleconfig.h
@@ -3,9 +3,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
+#include "svn_version.h"
+
 // Module info
 #define MODULE_NAME "FakeMeta"
-#define MODULE_VERSION "1.76d"
+#define MODULE_VERSION SVN_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "FAKEMETA"
diff --git a/dlls/fakemeta/sdk/svn_version.h b/dlls/fakemeta/sdk/svn_version.h
new file mode 100644
index 00000000..b7df7758
--- /dev/null
+++ b/dlls/fakemeta/sdk/svn_version.h
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"1.8.0.3377"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/fakemeta/sdk/svn_version.tpl b/dlls/fakemeta/sdk/svn_version.tpl
new file mode 100644
index 00000000..bf1d0d23
--- /dev/null
+++ b/dlls/fakemeta/sdk/svn_version.tpl
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/fun/amxxmodule.cpp b/dlls/fun/amxxmodule.cpp
index 30ef9c79..d8c8c56c 100755
--- a/dlls/fun/amxxmodule.cpp
+++ b/dlls/fun/amxxmodule.cpp
@@ -2773,7 +2773,7 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_FindLibrary(NULL, LibType_Class);
 	MF_AddLibraries(NULL, LibType_Class, NULL);
 	MF_RemoveLibraries(NULL);
-	MF_OverrideNatives(NULL);
+	MF_OverrideNatives(NULL, "");
 }
 #endif
 
diff --git a/dlls/fun/fun.sln b/dlls/fun/fun.sln
new file mode 100644
index 00000000..7f1b8736
--- /dev/null
+++ b/dlls/fun/fun.sln
@@ -0,0 +1,23 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fun_amx", "fun.vcproj", "{43B95C78-8D1A-4D12-B668-2520B38E1DA3}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{43B95C78-8D1A-4D12-B668-2520B38E1DA3}.Debug.ActiveCfg = Debug|Win32
+		{43B95C78-8D1A-4D12-B668-2520B38E1DA3}.Debug.Build.0 = Debug|Win32
+		{43B95C78-8D1A-4D12-B668-2520B38E1DA3}.Release.ActiveCfg = Release|Win32
+		{43B95C78-8D1A-4D12-B668-2520B38E1DA3}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/dlls/fun/moduleconfig.h b/dlls/fun/moduleconfig.h
index e63bf6f2..9f59f293 100755
--- a/dlls/fun/moduleconfig.h
+++ b/dlls/fun/moduleconfig.h
@@ -3,9 +3,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
+#include "svn_version.h"
+
 // Module info
 #define MODULE_NAME "Fun"
-#define MODULE_VERSION "1.76"
+#define MODULE_VERSION SVN_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "FUN"
diff --git a/dlls/fun/svn_version.h b/dlls/fun/svn_version.h
new file mode 100644
index 00000000..ce42667c
--- /dev/null
+++ b/dlls/fun/svn_version.h
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"1.8.0.2989"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/fun/svn_version.tpl b/dlls/fun/svn_version.tpl
new file mode 100644
index 00000000..bf1d0d23
--- /dev/null
+++ b/dlls/fun/svn_version.tpl
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/geoip/geoip.sln b/dlls/geoip/geoip.sln
new file mode 100644
index 00000000..49d75395
--- /dev/null
+++ b/dlls/geoip/geoip.sln
@@ -0,0 +1,23 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "geoip", "geoip.vcproj", "{036FA046-A6BF-4D80-8986-71FDD1528B55}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{036FA046-A6BF-4D80-8986-71FDD1528B55}.Debug.ActiveCfg = Debug|Win32
+		{036FA046-A6BF-4D80-8986-71FDD1528B55}.Debug.Build.0 = Debug|Win32
+		{036FA046-A6BF-4D80-8986-71FDD1528B55}.Release.ActiveCfg = Release|Win32
+		{036FA046-A6BF-4D80-8986-71FDD1528B55}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/dlls/geoip/moduleconfig.h b/dlls/geoip/moduleconfig.h
index bb738a9f..dbb5bcc7 100755
--- a/dlls/geoip/moduleconfig.h
+++ b/dlls/geoip/moduleconfig.h
@@ -3,9 +3,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
+#include "svn_version.h"
+
 // Module info
 #define MODULE_NAME "GeoIP"
-#define MODULE_VERSION "1.76"
+#define MODULE_VERSION SVN_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "GEOIP"
diff --git a/dlls/geoip/svn_version.h b/dlls/geoip/svn_version.h
new file mode 100644
index 00000000..e709ee4a
--- /dev/null
+++ b/dlls/geoip/svn_version.h
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"1.8.0.3043"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/geoip/svn_version.tpl b/dlls/geoip/svn_version.tpl
new file mode 100644
index 00000000..bf1d0d23
--- /dev/null
+++ b/dlls/geoip/svn_version.tpl
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/mysqlx/sdk/moduleconfig.h b/dlls/mysqlx/sdk/moduleconfig.h
index aba54baa..c76de407 100755
--- a/dlls/mysqlx/sdk/moduleconfig.h
+++ b/dlls/mysqlx/sdk/moduleconfig.h
@@ -3,6 +3,8 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
+#include "svn_version.h"
+
 /** Module info
  * -The logtag is the tag that the module's log messages will be
  *   prepended with.
@@ -15,7 +17,7 @@
  *   to add multiple entries.
  */
 #define MODULE_NAME "MySQL"
-#define MODULE_VERSION "1.76b"
+#define MODULE_VERSION SVN_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "MySQL"
diff --git a/dlls/mysqlx/sdk/svn_version.h b/dlls/mysqlx/sdk/svn_version.h
new file mode 100644
index 00000000..7f566327
--- /dev/null
+++ b/dlls/mysqlx/sdk/svn_version.h
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"1.8.0.3135"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/mysqlx/sdk/svn_version.tpl b/dlls/mysqlx/sdk/svn_version.tpl
new file mode 100644
index 00000000..bf1d0d23
--- /dev/null
+++ b/dlls/mysqlx/sdk/svn_version.tpl
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/ns/ns/moduleconfig.h b/dlls/ns/ns/moduleconfig.h
index 1373f073..1ade5e68 100755
--- a/dlls/ns/ns/moduleconfig.h
+++ b/dlls/ns/ns/moduleconfig.h
@@ -3,9 +3,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
+#include "svn_version.h"
+
 // Module info
 #define MODULE_NAME "NS"
-#define MODULE_VERSION "1.76d"
+#define MODULE_VERSION SVN_VERSION
 #define MODULE_AUTHOR "Steve Dudenhoeffer"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "NS"
diff --git a/dlls/ns/ns/svn_version.h b/dlls/ns/ns/svn_version.h
new file mode 100644
index 00000000..b7df7758
--- /dev/null
+++ b/dlls/ns/ns/svn_version.h
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"1.8.0.3377"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/ns/ns/svn_version.tpl b/dlls/ns/ns/svn_version.tpl
new file mode 100644
index 00000000..bf1d0d23
--- /dev/null
+++ b/dlls/ns/ns/svn_version.tpl
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/nvault/moduleconfig.h b/dlls/nvault/moduleconfig.h
index 13b23893..eef49b09 100755
--- a/dlls/nvault/moduleconfig.h
+++ b/dlls/nvault/moduleconfig.h
@@ -3,9 +3,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
+#include "svn_version.h"
+
 // Module info
 #define MODULE_NAME "nVault"
-#define MODULE_VERSION "1.76c"
+#define MODULE_VERSION SVN_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "nVault"
diff --git a/dlls/nvault/svn_version.h b/dlls/nvault/svn_version.h
new file mode 100644
index 00000000..da4c2515
--- /dev/null
+++ b/dlls/nvault/svn_version.h
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"1.8.0.3186"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/nvault/svn_version.tpl b/dlls/nvault/svn_version.tpl
new file mode 100644
index 00000000..bf1d0d23
--- /dev/null
+++ b/dlls/nvault/svn_version.tpl
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/regex/amxxmodule.cpp b/dlls/regex/amxxmodule.cpp
index 73d69197..4dd235ac 100755
--- a/dlls/regex/amxxmodule.cpp
+++ b/dlls/regex/amxxmodule.cpp
@@ -2771,7 +2771,7 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_FindLibrary(NULL, LibType_Class);
 	MF_AddLibraries(NULL, LibType_Class, NULL);
 	MF_RemoveLibraries(NULL);
-	MF_OverrideNatives(NULL);
+	MF_OverrideNatives(NULL, "");
 }
 #endif
 
diff --git a/dlls/regex/moduleconfig.h b/dlls/regex/moduleconfig.h
index 38f8e894..930aaa95 100755
--- a/dlls/regex/moduleconfig.h
+++ b/dlls/regex/moduleconfig.h
@@ -3,9 +3,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
+#include "svn_version.h"
+
 // Module info
 #define MODULE_NAME "RegEx"
-#define MODULE_VERSION "1.76"
+#define MODULE_VERSION SVN_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "REGEX"
diff --git a/dlls/regex/svn_version.h b/dlls/regex/svn_version.h
new file mode 100644
index 00000000..ce42667c
--- /dev/null
+++ b/dlls/regex/svn_version.h
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"1.8.0.2989"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/regex/svn_version.tpl b/dlls/regex/svn_version.tpl
new file mode 100644
index 00000000..bf1d0d23
--- /dev/null
+++ b/dlls/regex/svn_version.tpl
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/sockets/amxxmodule.cpp b/dlls/sockets/amxxmodule.cpp
index 73d69197..4dd235ac 100755
--- a/dlls/sockets/amxxmodule.cpp
+++ b/dlls/sockets/amxxmodule.cpp
@@ -2771,7 +2771,7 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_FindLibrary(NULL, LibType_Class);
 	MF_AddLibraries(NULL, LibType_Class, NULL);
 	MF_RemoveLibraries(NULL);
-	MF_OverrideNatives(NULL);
+	MF_OverrideNatives(NULL, "");
 }
 #endif
 
diff --git a/dlls/sockets/moduleconfig.h b/dlls/sockets/moduleconfig.h
index 7e7f922f..df9a52ff 100755
--- a/dlls/sockets/moduleconfig.h
+++ b/dlls/sockets/moduleconfig.h
@@ -3,9 +3,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
+#include "svn_version.h"
+
 // Module info
 #define MODULE_NAME "Sockets"
-#define MODULE_VERSION "1.76"
+#define MODULE_VERSION SVN_VERSION
 #define MODULE_AUTHOR "HLSW Dev Team"
 #define MODULE_URL "http://www.hlsw.net/"
 #define MODULE_LOGTAG "SOCKET"
diff --git a/dlls/sockets/svn_version.h b/dlls/sockets/svn_version.h
new file mode 100644
index 00000000..ce42667c
--- /dev/null
+++ b/dlls/sockets/svn_version.h
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"1.8.0.2989"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/sockets/svn_version.tpl b/dlls/sockets/svn_version.tpl
new file mode 100644
index 00000000..bf1d0d23
--- /dev/null
+++ b/dlls/sockets/svn_version.tpl
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/sqlite/sdk/moduleconfig.h b/dlls/sqlite/sdk/moduleconfig.h
index 02c922fc..8285554b 100755
--- a/dlls/sqlite/sdk/moduleconfig.h
+++ b/dlls/sqlite/sdk/moduleconfig.h
@@ -3,9 +3,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
+#include "svn_version.h"
+
 // Module info
 #define MODULE_NAME "SQLite"
-#define MODULE_VERSION "1.76b"
+#define MODULE_VERSION SVN_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "SQLITE"
diff --git a/dlls/sqlite/sdk/svn_version.h b/dlls/sqlite/sdk/svn_version.h
new file mode 100644
index 00000000..7f566327
--- /dev/null
+++ b/dlls/sqlite/sdk/svn_version.h
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"1.8.0.3135"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/sqlite/sdk/svn_version.tpl b/dlls/sqlite/sdk/svn_version.tpl
new file mode 100644
index 00000000..bf1d0d23
--- /dev/null
+++ b/dlls/sqlite/sdk/svn_version.tpl
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/tfc/tfcx/amxxmodule.cpp b/dlls/tfc/tfcx/amxxmodule.cpp
index 73d69197..4dd235ac 100755
--- a/dlls/tfc/tfcx/amxxmodule.cpp
+++ b/dlls/tfc/tfcx/amxxmodule.cpp
@@ -2771,7 +2771,7 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_FindLibrary(NULL, LibType_Class);
 	MF_AddLibraries(NULL, LibType_Class, NULL);
 	MF_RemoveLibraries(NULL);
-	MF_OverrideNatives(NULL);
+	MF_OverrideNatives(NULL, "");
 }
 #endif
 
diff --git a/dlls/tfc/tfcx/moduleconfig.h b/dlls/tfc/tfcx/moduleconfig.h
index a51631f2..8604cdd5 100755
--- a/dlls/tfc/tfcx/moduleconfig.h
+++ b/dlls/tfc/tfcx/moduleconfig.h
@@ -3,9 +3,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
+#include "svn_version.h"
+
 // Module info
 #define MODULE_NAME "TfcX"
-#define MODULE_VERSION "1.76"
+#define MODULE_VERSION SVN_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "TFCX"
diff --git a/dlls/tfc/tfcx/svn_version.h b/dlls/tfc/tfcx/svn_version.h
new file mode 100644
index 00000000..143f5e53
--- /dev/null
+++ b/dlls/tfc/tfcx/svn_version.h
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"1.8.0.3392"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/tfc/tfcx/svn_version.tpl b/dlls/tfc/tfcx/svn_version.tpl
new file mode 100644
index 00000000..bf1d0d23
--- /dev/null
+++ b/dlls/tfc/tfcx/svn_version.tpl
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/ts/tsx/amxxmodule.cpp b/dlls/ts/tsx/amxxmodule.cpp
index 73d69197..4dd235ac 100755
--- a/dlls/ts/tsx/amxxmodule.cpp
+++ b/dlls/ts/tsx/amxxmodule.cpp
@@ -2771,7 +2771,7 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_FindLibrary(NULL, LibType_Class);
 	MF_AddLibraries(NULL, LibType_Class, NULL);
 	MF_RemoveLibraries(NULL);
-	MF_OverrideNatives(NULL);
+	MF_OverrideNatives(NULL, "");
 }
 #endif
 
diff --git a/dlls/ts/tsx/moduleconfig.h b/dlls/ts/tsx/moduleconfig.h
index 325bbacd..07c8018a 100755
--- a/dlls/ts/tsx/moduleconfig.h
+++ b/dlls/ts/tsx/moduleconfig.h
@@ -3,9 +3,11 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
+#include "svn_version.h"
+
 // Module info
 #define MODULE_NAME "TSX"
-#define MODULE_VERSION "1.76"
+#define MODULE_VERSION SVN_VERSION
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "TSX"
diff --git a/dlls/ts/tsx/svn_version.h b/dlls/ts/tsx/svn_version.h
new file mode 100644
index 00000000..ce42667c
--- /dev/null
+++ b/dlls/ts/tsx/svn_version.h
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"1.8.0.2989"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/dlls/ts/tsx/svn_version.tpl b/dlls/ts/tsx/svn_version.tpl
new file mode 100644
index 00000000..bf1d0d23
--- /dev/null
+++ b/dlls/ts/tsx/svn_version.tpl
@@ -0,0 +1,9 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+/** This file is auto-generated by build scripts.  Do not edit it unless you know what you're doing. */
+/** Do not commit the generated .h file, as it will only mess up SVN revision numbers. */
+
+#define SVN_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+
+#endif //_INCLUDE_SVN_VERSION_H_
diff --git a/modules.versions b/modules.versions
new file mode 100644
index 00000000..b7139e81
--- /dev/null
+++ b/modules.versions
@@ -0,0 +1,94 @@
+[PRODUCT]
+major = 1
+minor = 8
+revision = 0
+
+[core]
+folder = amxmodx
+in = svn_version.tpl
+out = svn_version.h
+
+[plugins]
+folder = plugins/include
+in = svn_version.tpl
+out = svn_version.inc
+
+[cstrike]
+folder = dlls/cstrike
+in = svn_version.tpl
+out = svn_version.h
+
+[csx]
+folder = dlls/csx/source
+in = svn_version.tpl
+out = svn_version.h
+
+[dodfun]
+folder = dlls/dod2/dodfun
+in = svn_version.tpl
+out = svn_version.h
+
+[dodx]
+folder = dlls/dod2/dodx
+in = svn_version.tpl
+out = svn_version.h
+
+[engine]
+folder = dlls/engine
+in = svn_version.tpl
+out = svn_version.h
+
+[fakemeta]
+folder = dlls/fakemeta/sdk
+in = svn_version.tpl
+out = svn_version.h
+
+[fun]
+folder = dlls/fun
+in = svn_version.tpl
+out = svn_version.h
+
+[geoip]
+folder = dlls/geoip
+in = svn_version.tpl
+out = svn_version.h
+
+[mysqlx]
+folder = dlls/mysqlx/sdk
+in = svn_version.tpl
+out = svn_version.h
+
+[ns]
+folder = dlls/ns/ns
+in = svn_version.tpl
+out = svn_version.h
+
+[nvault]
+folder = dlls/nvault
+in = svn_version.tpl
+out = svn_version.h
+
+[regex]
+folder = dlls/regex
+in = svn_version.tpl
+out = svn_version.h
+
+[sockets]
+folder = dlls/sockets
+in = svn_version.tpl
+out = svn_version.h
+
+[sqlite]
+folder = dlls/sqlite/sdk
+in = svn_version.tpl
+out = svn_version.h
+
+[tfcx]
+folder = dlls/tfc/tfcx
+in = svn_version.tpl
+out = svn_version.h
+
+[tsx]
+folder = dlls/ts/tsx
+in = svn_version.tpl
+out = svn_version.h
\ No newline at end of file
diff --git a/plugins/include/amxconst.inc b/plugins/include/amxconst.inc
index f01af7ba..ffe56212 100755
--- a/plugins/include/amxconst.inc
+++ b/plugins/include/amxconst.inc
@@ -11,9 +11,7 @@
 #endif
 #define _amxconst_included
 
-#define AMXX_VERSION		1.764
-#define AMXX_VERSION_NUM	176
-stock const AMXX_VERSION_STR[]="1.76d";
+#include <svn_version>
 
 #define M_PI 3.1415926535
 
diff --git a/plugins/include/svn_version.inc b/plugins/include/svn_version.inc
new file mode 100644
index 00000000..a18489db
--- /dev/null
+++ b/plugins/include/svn_version.inc
@@ -0,0 +1,16 @@
+/* AMX Mod X constants
+*
+* by the AMX Mod X Development Team
+*  originally developed by OLO
+*
+* This file is provided as is (no warranties).
+*/
+
+#if defined _svnversion_included
+  #endinput
+#endif
+#define _svnversion_included
+
+#define AMXX_VERSION		1.80
+#define AMXX_VERSION_NUM	180
+stock const AMXX_VERSION_STR[] = "1.8.0.3398"
diff --git a/plugins/include/svn_version.tpl b/plugins/include/svn_version.tpl
new file mode 100644
index 00000000..891c5a47
--- /dev/null
+++ b/plugins/include/svn_version.tpl
@@ -0,0 +1,16 @@
+/* AMX Mod X constants
+*
+* by the AMX Mod X Development Team
+*  originally developed by OLO
+*
+* This file is provided as is (no warranties).
+*/
+
+#if defined _svnversion_included
+  #endinput
+#endif
+#define _svnversion_included
+
+#define AMXX_VERSION		$PMAJOR$.$PMINOR$$PREVISION$
+#define AMXX_VERSION_NUM	$PMAJOR$$PMINOR$$PREVISION$
+stock const AMXX_VERSION_STR[] = "$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
diff --git a/versionchanger.pl b/versionchanger.pl
new file mode 100644
index 00000000..a8457e93
--- /dev/null
+++ b/versionchanger.pl
@@ -0,0 +1,165 @@
+#!/usr/bin/perl
+
+our %arguments =
+(
+	'config' => 'modules.versions',
+	'major' => '1',
+	'minor' => '0',
+	'revision' => '0',
+	'build' => undef,
+	'svnrev' => 'global',
+	'path' => '',
+);
+
+my $arg;
+foreach $arg (@ARGV)
+{
+	$arg =~ s/--//;
+	@arg = split(/=/, $arg);
+	$arguments{$arg[0]} = $arg[1];
+}
+
+#Set up path info
+if ($arguments{'path'} ne "")
+{
+	if (!(-d $arguments{'path'}))
+	{
+		die "Unable to find path: " . $arguments{'path'} ."\n";
+	}
+	chdir($arguments{'path'});
+}
+
+if (!open(CONFIG, $arguments{'config'}))
+{
+	die "Unable to open config file for reading: " . $arguments{'config'} . "\n";
+}
+
+our %modules;
+my $cur_module = undef;
+my $line;
+while (<CONFIG>)
+{
+	chomp;
+	$line = $_;
+	if ($line =~ /^\[([^\]]+)\]$/)
+	{
+		$cur_module = $1;
+		next;
+	}
+	if (!$cur_module)
+	{
+		next;
+	}
+	if ($line =~ /^([^=]+) = (.+)$/)
+	{
+		$modules{$cur_module}{$1} = $2;
+	}
+}
+
+close(CONFIG);
+
+#Copy global configuration options...
+if (exists($modules{'PRODUCT'}))
+{
+	if (exists($modules{'PRODUCT'}{'major'}))
+	{
+		$arguments{'major'} = $modules{'PRODUCT'}{'major'};
+	}
+	if (exists($modules{'PRODUCT'}{'minor'}))
+	{
+		$arguments{'minor'} = $modules{'PRODUCT'}{'minor'};
+	}
+	if (exists($modules{'PRODUCT'}{'revision'}))
+	{
+		$arguments{'revision'} = $modules{'PRODUCT'}{'revision'};
+	}
+	if (exists($modules{'PRODUCT'}{'svnrev'}))
+	{
+		$arguments{'svnrev'} = $modules{'PRODUCT'}{'svnrev'};
+	}
+}
+
+#Get the global SVN revision if we have none
+my $rev;
+if ($arguments{'build'} == undef)
+{
+	$rev = GetRevision(undef);
+} else {
+	$rev = int($arguments{'build'});
+}
+
+my $major = $arguments{'major'};
+my $minor = $arguments{'minor'};
+my $revision = $arguments{'revision'};
+my $svnrev = $arguments{'svnrev'};
+
+#Go through everything now
+my $mod_i;
+while ( ($cur_module, $mod_i) = each(%modules) )
+{
+	#Skip the magic one
+	if ($cur_module eq "PRODUCT")
+	{
+		next;
+	}
+	#Prepare path
+	my %mod = %{$mod_i};
+	my $infile = $mod{'in'};
+	my $outfile = $mod{'out'};
+	if ($mod{'folder'})
+	{
+		if (!(-d $mod{'folder'}))
+		{
+			die "Folder " . $mod{'folder'} . " not found.\n";
+		}
+		$infile = $mod{'folder'} . '/' . $infile;
+		$outfile = $mod{'folder'} . '/' . $outfile;
+	}
+	if (!(-f $infile))
+	{
+		die "File $infile is not a file.\n";
+	}
+	my $global_rev = $rev;
+	my $local_rev = GetRevision($mod{'folder'});
+	if ($arguments{'svnrev'} eq 'local')
+	{
+		$global_rev = $local_rev;
+	}
+	#Start rewriting
+	open(INFILE, $infile) or die "Could not open file for reading: $infile\n";
+	open(OUTFILE, '>'.$outfile) or die "Could not open file for writing: $outfile\n";
+	while (<INFILE>)
+	{
+		s/\$PMAJOR\$/$major/g;
+		s/\$PMINOR\$/$minor/g;
+		s/\$PREVISION\$/$revision/g;
+		s/\$GLOBAL_BUILD\$/$rev/g;
+		s/\$LOCAL_BUILD\$/$local_rev/g;
+		print OUTFILE $_;
+	}
+	close(OUTFILE);
+	close(INFILE);
+}
+
+sub GetRevision
+{
+	my ($path)=(@_);
+	my $rev;
+	if (!$path)
+	{
+		$rev = `svnversion --committed`;
+	} else {
+		$rev = `svnversion --committed $path`;
+	}
+	if ($rev =~ /exported/)
+	{
+		die "Path specified is not a working copy\n";
+	} elsif ($rev =~ /(\d+):(\d+)/) {
+		$rev = int($2);
+	} elsif ($rev =~ /(\d+)/) {
+		$rev = int($1);
+	} else {
+		die "Unknown svnversion response: $rev\n";
+	}
+	return $rev;
+}