diff --git a/core/sm_srvcmds.cpp b/core/sm_srvcmds.cpp
index 957d4ff17..7df5e42e9 100644
--- a/core/sm_srvcmds.cpp
+++ b/core/sm_srvcmds.cpp
@@ -268,17 +268,22 @@ void RootConsoleMenu::OnRootConsoleCommand(const char *cmdname, const CCommand &
 		ConsolePrint(" SourceMod was developed by AlliedModders, LLC.");
 		ConsolePrint(" Development would not have been possible without the following people:");
 		ConsolePrint("  David \"BAILOPAN\" Anderson, lead developer");
-		ConsolePrint("  Borja \"faluco\" Ferrer, Core developer");
-		ConsolePrint("  Scott \"Damaged Soul\" Ehlert, Core developer");
+		ConsolePrint("  Borja \"faluco\" Ferrer, core developer");
+		ConsolePrint("  Scott \"Damaged Soul\" Ehlert, core developer");
+		ConsolePrint("  Matt \"pRED\" Woodrow, core developer");
+		ConsolePrint("  Michael \"ferret\" McKoy, plugin developer");
 		ConsolePrint("  Pavol \"PM OnoTo\" Marko, SourceHook developer");
 		ConsolePrint(" Special thanks to Viper of GameConnect");
 		ConsolePrint(" Special thanks to Mani of Mani-Admin-Plugin");
 		ConsolePrint(" http://www.sourcemod.net/");
-	} else if (strcmp(cmdname, "version") == 0) {
+	}
+	else if (strcmp(cmdname, "version") == 0)
+	{
 		ConsolePrint(" SourceMod Version Information:");
 		ConsolePrint("    SourceMod Version: %s", SVN_FULL_VERSION);
 		ConsolePrint("    JIT Version: %s, %s", g_pVM->GetVMName(), g_pVM->GetVersionString());
 		ConsolePrint("    JIT Settings: %s", g_pVM->GetCPUOptimizations());
+		ConsolePrint("    Compiled on: %s %s", __DATE__, __TIME__);
 		ConsolePrint("    http://www.sourcemod.net/");
 	}
 }
diff --git a/core/sm_version.h b/core/sm_version.h
index 5e1eaf906..f27adc008 100644
--- a/core/sm_version.h
+++ b/core/sm_version.h
@@ -40,7 +40,7 @@
  * @file Contains SourceMod version information.
  */
 
-#define SVN_FULL_VERSION	"1.1.0.1995"
-#define SVN_FILE_VERSION	1,1,0,1995
+#define SVN_FULL_VERSION	"1.1.0-svn"
+#define SVN_FILE_VERSION	1,1,0,2230
 
 #endif //_INCLUDE_SOURCEMOD_VERSION_H_
diff --git a/core/sm_version.tpl b/core/sm_version.tpl
index c9d0c6a32..4c92c985c 100644
--- a/core/sm_version.tpl
+++ b/core/sm_version.tpl
@@ -40,7 +40,7 @@
  * @file Contains SourceMod version information.
  */
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
 #define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
 
 #endif //_INCLUDE_SOURCEMOD_VERSION_H_
diff --git a/core/systems/PluginSys.cpp b/core/systems/PluginSys.cpp
index c6177c3c1..5e0f439ce 100644
--- a/core/systems/PluginSys.cpp
+++ b/core/systems/PluginSys.cpp
@@ -373,6 +373,36 @@ void CPlugin::UpdateInfo()
 	m_info.name = m_info.name ? m_info.name : "";
 	m_info.url = m_info.url ? m_info.url : "";
 	m_info.version = m_info.version ? m_info.version : "";
+
+	if ((err = base->FindPubvarByName("__version", &idx)) == SP_ERROR_NONE)
+	{
+		struct __version_info
+		{
+			cell_t version;
+			cell_t filevers;
+			cell_t date;
+			cell_t time;
+		};
+		__version_info *info;
+		cell_t local_addr;
+		const char *pDate, *pTime;
+
+		pDate = "";
+		pTime = "";
+
+		base->GetPubvarAddrs(idx, &local_addr, (cell_t **)&info);
+		m_FileVersion = info->version;
+		if (m_FileVersion >= 3)
+		{
+			base->LocalToString(info->date, (char **)&pDate);
+			base->LocalToString(info->time, (char **)&pTime);
+			UTIL_Format(m_DateTime, sizeof(m_DateTime), "%s %s", pDate, pTime);
+		}
+	}
+	else
+	{
+		m_FileVersion = 0;
+	}
 }
 
 void CPlugin::Call_OnPluginStart()
@@ -2034,12 +2064,13 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &c
 				g_RootMenu.ConsolePrint("[SM] Listing %d plugin%s:", GetPluginCount(), (plnum > 1) ? "s" : "");
 			}
 
-			SourceHook::List<IPlugin *> m_FailList;
+			CPlugin *pl;
+			SourceHook::List<CPlugin *>::iterator iter;
+			SourceHook::List<CPlugin *> m_FailList;
 
-			IPluginIterator *iter = GetPluginIterator();
-			for (; iter->MorePlugins(); iter->NextPlugin(), id++)
+			for (iter = m_plugins.begin(); iter != m_plugins.end(); iter++)
 			{
-				IPlugin *pl = iter->GetPlugin();
+				pl = (*iter);
 				assert(pl->GetStatus() != Plugin_Created);
 				int len = 0;
 				const sm_plugininfo_t *info = pl->GetPublicInfo();
@@ -2069,13 +2100,11 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &c
 				g_RootMenu.ConsolePrint("%s", buffer);
 			}
 
-			iter->Release();
-
 			if (!m_FailList.empty())
 			{
 				g_RootMenu.ConsolePrint("Load Errors:");
 
-				SourceHook::List<IPlugin *>::iterator _iter;
+				SourceHook::List<CPlugin *>::iterator _iter;
 
 				CPlugin *pl;
 
@@ -2272,8 +2301,21 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &c
 				}
 				else
 				{
-					g_RootMenu.ConsolePrint("  Debugging: %s", pl->IsDebugging() ? "Yes" : "No");
-					g_RootMenu.ConsolePrint("  Running: %s", pl->GetStatus() == Plugin_Running ? "Yes" : "No");
+					if (pl->GetStatus() == Plugin_Running)
+					{
+						if (pl->IsDebugging())
+						{
+							g_RootMenu.ConsolePrint("  Status: running, debugging");
+						}
+						else
+						{
+							g_RootMenu.ConsolePrint("  Status: running");
+						}
+					}
+					else
+					{
+						g_RootMenu.ConsolePrint("  Status: not running");
+					}
 
 					const char *typestr = "";
 					switch (pl->GetType())
@@ -2292,6 +2334,10 @@ void CPluginManager::OnRootConsoleCommand(const char *cmdname, const CCommand &c
 
 					g_RootMenu.ConsolePrint("  Reloads: %s", typestr);
 				}
+				if (pl->m_FileVersion >= 3)
+				{
+					g_RootMenu.ConsolePrint("  Timestamp: %s", pl->m_DateTime);
+				}
 			}
 			else
 			{
diff --git a/core/systems/PluginSys.h b/core/systems/PluginSys.h
index ff0bca9d1..7e79871ab 100644
--- a/core/systems/PluginSys.h
+++ b/core/systems/PluginSys.h
@@ -287,6 +287,8 @@ private:
 	bool m_LibraryMissing;
 	CVector<AutoConfig *> m_configs;
 	bool m_bGotAllLoaded;
+	int m_FileVersion;
+	char m_DateTime[256];
 };
 
 class CPluginManager : 
diff --git a/extensions/bintools/sdk/smsdk_config.h b/extensions/bintools/sdk/smsdk_config.h
index f706d6dd9..760ef3efc 100644
--- a/extensions/bintools/sdk/smsdk_config.h
+++ b/extensions/bintools/sdk/smsdk_config.h
@@ -46,7 +46,7 @@
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"SAMPLE"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__
+#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
 
 /** 
  * @brief Exposes plugin's main interface.
diff --git a/extensions/bintools/svn_version.h b/extensions/bintools/svn_version.h
index bbf78ce08..854d48853 100644
--- a/extensions/bintools/svn_version.h
+++ b/extensions/bintools/svn_version.h
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_BINTOOLS_VERSION_H_
 #define _INCLUDE_BINTOOLS_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.1.0.1971"
-#define SVN_FILE_VERSION	1,1,0,1971
+#define SVN_FULL_VERSION	"1.1.0-svn"
+#define SVN_FILE_VERSION	1,1,0,2230
 
 #endif //_INCLUDE_BINTOOLS_VERSION_H_
diff --git a/extensions/bintools/svn_version.tpl b/extensions/bintools/svn_version.tpl
index 300ade1f2..e3c41e25e 100644
--- a/extensions/bintools/svn_version.tpl
+++ b/extensions/bintools/svn_version.tpl
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_BINTOOLS_VERSION_H_
 #define _INCLUDE_BINTOOLS_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
 #define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
 
 #endif //_INCLUDE_BINTOOLS_VERSION_H_
diff --git a/extensions/clientprefs/sdk/smsdk_config.h b/extensions/clientprefs/sdk/smsdk_config.h
index e46ba2c70..d50fe64ac 100644
--- a/extensions/clientprefs/sdk/smsdk_config.h
+++ b/extensions/clientprefs/sdk/smsdk_config.h
@@ -47,7 +47,7 @@
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"CLIENTPREFS"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__
+#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
 
 /** 
  * @brief Exposes plugin's main interface.
diff --git a/extensions/clientprefs/svn_version.h b/extensions/clientprefs/svn_version.h
index e7ff73369..2fb0d0284 100644
--- a/extensions/clientprefs/svn_version.h
+++ b/extensions/clientprefs/svn_version.h
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_CLIENTPREFS_VERSION_H_
 #define _INCLUDE_CLIENTPREFS_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.1.0.1982"
-#define SVN_FILE_VERSION	1,1,0,1982
+#define SVN_FULL_VERSION	"1.1.0-svn"
+#define SVN_FILE_VERSION	1,1,0,2230
 
-#endif //_INCLUDE_SDKTOOLS_VERSION_H_
+#endif //_INCLUDE_CLIENTPREFS_VERSION_H_
diff --git a/extensions/clientprefs/svn_version.tpl b/extensions/clientprefs/svn_version.tpl
index 5e0b031a2..3ceaee298 100644
--- a/extensions/clientprefs/svn_version.tpl
+++ b/extensions/clientprefs/svn_version.tpl
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_CLIENTPREFS_VERSION_H_
 #define _INCLUDE_CLIENTPREFS_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
 #define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
 
 #endif //_INCLUDE_CLIENTPREFS_VERSION_H_
diff --git a/extensions/cstrike/sdk/smsdk_config.h b/extensions/cstrike/sdk/smsdk_config.h
index c3b6081ab..d3860fa26 100644
--- a/extensions/cstrike/sdk/smsdk_config.h
+++ b/extensions/cstrike/sdk/smsdk_config.h
@@ -47,7 +47,7 @@
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"CSTRIKE"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__
+#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
 
 /** 
  * @brief Exposes plugin's main interface.
diff --git a/extensions/cstrike/svn_version.h b/extensions/cstrike/svn_version.h
index 465e6da58..d6f5a842e 100644
--- a/extensions/cstrike/svn_version.h
+++ b/extensions/cstrike/svn_version.h
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_SDKTOOLS_VERSION_H_
 #define _INCLUDE_SDKTOOLS_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.1.0.1971"
-#define SVN_FILE_VERSION	1,1,0,1971
+#define SVN_FULL_VERSION	"1.1.0-svn"
+#define SVN_FILE_VERSION	1,1,0,2230
 
 #endif //_INCLUDE_SDKTOOLS_VERSION_H_
diff --git a/extensions/cstrike/svn_version.tpl b/extensions/cstrike/svn_version.tpl
index 70dd13dea..3377580d0 100644
--- a/extensions/cstrike/svn_version.tpl
+++ b/extensions/cstrike/svn_version.tpl
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_SDKTOOLS_VERSION_H_
 #define _INCLUDE_SDKTOOLS_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
 #define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
 
 #endif //_INCLUDE_SDKTOOLS_VERSION_H_
diff --git a/extensions/geoip/sdk/smsdk_config.h b/extensions/geoip/sdk/smsdk_config.h
index dbe2ad2cf..aeb9b32f0 100644
--- a/extensions/geoip/sdk/smsdk_config.h
+++ b/extensions/geoip/sdk/smsdk_config.h
@@ -46,7 +46,7 @@
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"GEOIP"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__
+#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
 
 /** 
  * @brief Exposes plugin's main interface.
diff --git a/extensions/geoip/svn_version.h b/extensions/geoip/svn_version.h
index eb58df939..f8f754add 100644
--- a/extensions/geoip/svn_version.h
+++ b/extensions/geoip/svn_version.h
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_GEOIP_VERSION_H_
 #define _INCLUDE_GEOIP_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.1.0.1971"
-#define SVN_FILE_VERSION	1,1,0,1971
+#define SVN_FULL_VERSION	"1.1.0-svn"
+#define SVN_FILE_VERSION	1,1,0,2230
 
 #endif //_INCLUDE_GEOIP_VERSION_H_
diff --git a/extensions/geoip/svn_version.tpl b/extensions/geoip/svn_version.tpl
index e63e84f91..d2d1d844e 100644
--- a/extensions/geoip/svn_version.tpl
+++ b/extensions/geoip/svn_version.tpl
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_GEOIP_VERSION_H_
 #define _INCLUDE_GEOIP_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
 #define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
 
 #endif //_INCLUDE_GEOIP_VERSION_H_
diff --git a/extensions/mysql/sdk/smsdk_config.h b/extensions/mysql/sdk/smsdk_config.h
index d5bb8c444..48ac2c2ae 100644
--- a/extensions/mysql/sdk/smsdk_config.h
+++ b/extensions/mysql/sdk/smsdk_config.h
@@ -47,7 +47,7 @@
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"MYSQL"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__
+#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
 
 /** 
  * @brief Exposes plugin's main interface.
diff --git a/extensions/mysql/svn_version.h b/extensions/mysql/svn_version.h
index 783b1e6b7..bd9797b54 100644
--- a/extensions/mysql/svn_version.h
+++ b/extensions/mysql/svn_version.h
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_MYSQLEXT_VERSION_H_
 #define _INCLUDE_MYSQLEXT_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.1.0.1971"
-#define SVN_FILE_VERSION	1,1,0,1971
+#define SVN_FULL_VERSION	"1.1.0-svn"
+#define SVN_FILE_VERSION	1,1,0,2230
 
 #endif //_INCLUDE_MYSQLEXT_VERSION_H_
diff --git a/extensions/mysql/svn_version.tpl b/extensions/mysql/svn_version.tpl
index c6767e37c..71e37adb5 100644
--- a/extensions/mysql/svn_version.tpl
+++ b/extensions/mysql/svn_version.tpl
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_MYSQLEXT_VERSION_H_
 #define _INCLUDE_MYSQLEXT_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
 #define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
 
 #endif //_INCLUDE_MYSQLEXT_VERSION_H_
diff --git a/extensions/regex/sdk/smsdk_config.h b/extensions/regex/sdk/smsdk_config.h
index 294cd9928..719ed0c74 100644
--- a/extensions/regex/sdk/smsdk_config.h
+++ b/extensions/regex/sdk/smsdk_config.h
@@ -47,7 +47,7 @@
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"REGEX"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__
+#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
 
 /** 
  * @brief Exposes plugin's main interface.
diff --git a/extensions/regex/svn_version.h b/extensions/regex/svn_version.h
index e3b80bba0..7bd120c93 100644
--- a/extensions/regex/svn_version.h
+++ b/extensions/regex/svn_version.h
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_REGEXEXT_VERSION_H_
 #define _INCLUDE_REGEXEXT_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.1.0.1994"
-#define SVN_FILE_VERSION	1,1,0,1994
+#define SVN_FULL_VERSION	"1.1.0-svn"
+#define SVN_FILE_VERSION	1,1,0,2230
 
 #endif //_INCLUDE_REGEXEXT_VERSION_H_
diff --git a/extensions/regex/svn_version.tpl b/extensions/regex/svn_version.tpl
index 1913ce6b6..3cbf9f193 100644
--- a/extensions/regex/svn_version.tpl
+++ b/extensions/regex/svn_version.tpl
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_REGEXEXT_VERSION_H_
 #define _INCLUDE_REGEXEXT_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
 #define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
 
 #endif //_INCLUDE_REGEXEXT_VERSION_H_
diff --git a/extensions/sdktools/sdk/smsdk_config.h b/extensions/sdktools/sdk/smsdk_config.h
index 3f41c1fe9..c4b145398 100644
--- a/extensions/sdktools/sdk/smsdk_config.h
+++ b/extensions/sdktools/sdk/smsdk_config.h
@@ -47,7 +47,7 @@
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"SDKTOOLS"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__
+#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
 
 /** 
  * @brief Exposes plugin's main interface.
diff --git a/extensions/sdktools/svn_version.h b/extensions/sdktools/svn_version.h
index 9894f5827..421460341 100644
--- a/extensions/sdktools/svn_version.h
+++ b/extensions/sdktools/svn_version.h
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_SDKTOOLS_VERSION_H_
 #define _INCLUDE_SDKTOOLS_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.1.0.1982"
-#define SVN_FILE_VERSION	1,1,0,1982
+#define SVN_FULL_VERSION	"1.1.0-svn"
+#define SVN_FILE_VERSION	1,1,0,2230
 
 #endif //_INCLUDE_SDKTOOLS_VERSION_H_
diff --git a/extensions/sdktools/svn_version.tpl b/extensions/sdktools/svn_version.tpl
index 6f19f7c23..2b1e90f27 100644
--- a/extensions/sdktools/svn_version.tpl
+++ b/extensions/sdktools/svn_version.tpl
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_SDKTOOLS_VERSION_H_
 #define _INCLUDE_SDKTOOLS_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
 #define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
 
 #endif //_INCLUDE_SDKTOOLS_VERSION_H_
diff --git a/extensions/sqlite/sdk/smsdk_config.h b/extensions/sqlite/sdk/smsdk_config.h
index a8823b814..8911183ba 100644
--- a/extensions/sqlite/sdk/smsdk_config.h
+++ b/extensions/sqlite/sdk/smsdk_config.h
@@ -47,7 +47,7 @@
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"SQLITE"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__
+#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
 
 /** 
  * @brief Exposes plugin's main interface.
diff --git a/extensions/sqlite/svn_version.h b/extensions/sqlite/svn_version.h
index 6cd856844..0b1f7aabd 100644
--- a/extensions/sqlite/svn_version.h
+++ b/extensions/sqlite/svn_version.h
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_SQLITEEXT_VERSION_H_
 #define _INCLUDE_SQLITEEXT_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.1.0.1971"
-#define SVN_FILE_VERSION	1,1,0,1971
+#define SVN_FULL_VERSION	"1.1.0-svn"
+#define SVN_FILE_VERSION	1,1,0,2230
 
 #endif //_INCLUDE_SQLITEEXT_VERSION_H_
diff --git a/extensions/sqlite/svn_version.tpl b/extensions/sqlite/svn_version.tpl
index 5d82ae522..6d0737799 100644
--- a/extensions/sqlite/svn_version.tpl
+++ b/extensions/sqlite/svn_version.tpl
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_SQLITEEXT_VERSION_H_
 #define _INCLUDE_SQLITEEXT_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
 #define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
 
 #endif //_INCLUDE_SQLITEEXT_VERSION_H_
diff --git a/extensions/tf2/sdk/smsdk_config.h b/extensions/tf2/sdk/smsdk_config.h
index 990d9b05b..a9d6638c8 100644
--- a/extensions/tf2/sdk/smsdk_config.h
+++ b/extensions/tf2/sdk/smsdk_config.h
@@ -47,7 +47,7 @@
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
 #define SMEXT_CONF_LOGTAG		"TF2"
 #define SMEXT_CONF_LICENSE		"GPL"
-#define SMEXT_CONF_DATESTRING	__DATE__
+#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
 
 /** 
  * @brief Exposes plugin's main interface.
diff --git a/extensions/tf2/svn_version.h b/extensions/tf2/svn_version.h
index b1eff81cd..fc92bcd4c 100644
--- a/extensions/tf2/svn_version.h
+++ b/extensions/tf2/svn_version.h
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_SDKTOOLS_VERSION_H_
 #define _INCLUDE_SDKTOOLS_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.1.0.1993"
-#define SVN_FILE_VERSION	1,1,0,1993
+#define SVN_FULL_VERSION	"1.1.0-svn"
+#define SVN_FILE_VERSION	1,1,0,2230
 
 #endif //_INCLUDE_SDKTOOLS_VERSION_H_
diff --git a/extensions/tf2/svn_version.tpl b/extensions/tf2/svn_version.tpl
index 277f9f2b2..d8f49c127 100644
--- a/extensions/tf2/svn_version.tpl
+++ b/extensions/tf2/svn_version.tpl
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_SDKTOOLS_VERSION_H_
 #define _INCLUDE_SDKTOOLS_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
 #define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
 
 #endif //_INCLUDE_SDKTOOLS_VERSION_H_
diff --git a/extensions/topmenus/sdk/smsdk_config.h b/extensions/topmenus/sdk/smsdk_config.h
index 078aca753..c119c5a73 100644
--- a/extensions/topmenus/sdk/smsdk_config.h
+++ b/extensions/topmenus/sdk/smsdk_config.h
@@ -45,9 +45,9 @@
 #define SMEXT_CONF_VERSION		SVN_FULL_VERSION
 #define SMEXT_CONF_AUTHOR		"AlliedModders"
 #define SMEXT_CONF_URL			"http://www.sourcemod.net/"
-#define SMEXT_CONF_LOGTAG		"MAINMENU"
+#define SMEXT_CONF_LOGTAG		"TOPMENUS"
 #define SMEXT_CONF_LICENSE		"GPLv3"
-#define SMEXT_CONF_DATESTRING	__DATE__
+#define SMEXT_CONF_DATESTRING	__DATE__ " " __TIME__
 
 /** 
  * @brief Exposes plugin's main interface.
diff --git a/extensions/topmenus/svn_version.h b/extensions/topmenus/svn_version.h
index cf0fc49d4..95d62964a 100644
--- a/extensions/topmenus/svn_version.h
+++ b/extensions/topmenus/svn_version.h
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_SQLITEEXT_VERSION_H_
 #define _INCLUDE_SQLITEEXT_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.1.0.1971"
-#define SVN_FILE_VERSION	1,1,0,1971
+#define SVN_FULL_VERSION	"1.1.0-svn"
+#define SVN_FILE_VERSION	1,1,0,2230
 
 #endif //_INCLUDE_SQLITEEXT_VERSION_H_
diff --git a/extensions/topmenus/svn_version.tpl b/extensions/topmenus/svn_version.tpl
index cbde34116..86ee82009 100644
--- a/extensions/topmenus/svn_version.tpl
+++ b/extensions/topmenus/svn_version.tpl
@@ -36,7 +36,7 @@
 #ifndef _INCLUDE_SQLITEEXT_VERSION_H_
 #define _INCLUDE_SQLITEEXT_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
 #define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
 
 #endif //_INCLUDE_SQLITEEXT_VERSION_H_
diff --git a/loader/svn_version.h b/loader/svn_version.h
index 5e1eaf906..f27adc008 100644
--- a/loader/svn_version.h
+++ b/loader/svn_version.h
@@ -40,7 +40,7 @@
  * @file Contains SourceMod version information.
  */
 
-#define SVN_FULL_VERSION	"1.1.0.1995"
-#define SVN_FILE_VERSION	1,1,0,1995
+#define SVN_FULL_VERSION	"1.1.0-svn"
+#define SVN_FILE_VERSION	1,1,0,2230
 
 #endif //_INCLUDE_SOURCEMOD_VERSION_H_
diff --git a/loader/svn_version.tpl b/loader/svn_version.tpl
index c9d0c6a32..4c92c985c 100644
--- a/loader/svn_version.tpl
+++ b/loader/svn_version.tpl
@@ -40,7 +40,7 @@
  * @file Contains SourceMod version information.
  */
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
 #define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
 
 #endif //_INCLUDE_SOURCEMOD_VERSION_H_
diff --git a/plugins/include/core.inc b/plugins/include/core.inc
index b64de1978..5ad7bcb5e 100644
--- a/plugins/include/core.inc
+++ b/plugins/include/core.inc
@@ -37,11 +37,13 @@
 
 #include <version>
 
-#define SOURCEMOD_PLUGINAPI_VERSION		2
+#define SOURCEMOD_PLUGINAPI_VERSION		3
 struct PlVers
 {
 	version,
 	String:filevers[],
+	String:date[],
+	String:time[]
 };
 
 /**
@@ -76,7 +78,9 @@ enum Identity
 public PlVers:__version = 
 {
 	version = SOURCEMOD_PLUGINAPI_VERSION,
-	filevers = SOURCEMOD_VERSION
+	filevers = SOURCEMOD_VERSION,
+	date = __DATE__,
+	time = __TIME__
 };
 
 /**
diff --git a/plugins/include/version.inc b/plugins/include/version.inc
index 9874043b8..8bfa4e70d 100644
--- a/plugins/include/version.inc
+++ b/plugins/include/version.inc
@@ -39,4 +39,4 @@
 #define SOURCEMOD_V_MINOR		1				/**< SourceMod Minor version */
 #define SOURCEMOD_V_RELEASE		0				/**< SourceMod Release version */
 
-#define SOURCEMOD_VERSION		"1.1.0.1995"	/**< SourceMod version string (major.minor.release.build) */
+#define SOURCEMOD_VERSION		"1.1.0-svn"	/**< SourceMod version string (major.minor.release.build) */
diff --git a/plugins/include/version.tpl b/plugins/include/version.tpl
index 28e8d0e03..f9a7db36d 100644
--- a/plugins/include/version.tpl
+++ b/plugins/include/version.tpl
@@ -39,4 +39,4 @@
 #define SOURCEMOD_V_MINOR		$PMINOR$				/**< SourceMod Minor version */
 #define SOURCEMOD_V_RELEASE		$PREVISION$				/**< SourceMod Release version */
 
-#define SOURCEMOD_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"	/**< SourceMod version string (major.minor.release.build) */
+#define SOURCEMOD_VERSION		"$PMAJOR$.$PMINOR$.$PREVISION$-svn"	/**< SourceMod version string (major.minor.release.build) */
diff --git a/sourcepawn/compiler/svn_version.h b/sourcepawn/compiler/svn_version.h
index 6246599cf..1bb31b24d 100644
--- a/sourcepawn/compiler/svn_version.h
+++ b/sourcepawn/compiler/svn_version.h
@@ -19,7 +19,7 @@
  * @file Contains SourceMod version information.
  */
 
-#define SVN_FULL_VERSION	"1.1.0.1992"
-#define SVN_FILE_VERSION	1,1,0,1992
+#define SVN_FULL_VERSION	"1.1.0-svn"
+#define SVN_FILE_VERSION	1,1,0,2139
 
 #endif //_INCLUDE_SOURCEMOD_VERSION_H_
diff --git a/sourcepawn/compiler/svn_version.tpl b/sourcepawn/compiler/svn_version.tpl
index fab83d158..c74e85701 100644
--- a/sourcepawn/compiler/svn_version.tpl
+++ b/sourcepawn/compiler/svn_version.tpl
@@ -19,7 +19,7 @@
  * @file Contains SourceMod version information.
  */
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
 #define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$LOCAL_BUILD$
 
 #endif //_INCLUDE_SOURCEMOD_VERSION_H_
diff --git a/sourcepawn/jit/x86/jit_version.h b/sourcepawn/jit/x86/jit_version.h
index 8e8b00a5e..d4dbade04 100644
--- a/sourcepawn/jit/x86/jit_version.h
+++ b/sourcepawn/jit/x86/jit_version.h
@@ -16,7 +16,7 @@
 #ifndef _INCLUDE_JIT_VERSION_H_
 #define _INCLUDE_JIT_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.1.0.1971"
-#define SVN_FILE_VERSION	1,1,0,1971
+#define SVN_FULL_VERSION	"1.1.0-svn"
+#define SVN_FILE_VERSION	1,1,0,2218
 
 #endif //_INCLUDE_JIT_VERSION_H_
diff --git a/sourcepawn/jit/x86/jit_version.tpl b/sourcepawn/jit/x86/jit_version.tpl
index ec873f89f..a955cd864 100644
--- a/sourcepawn/jit/x86/jit_version.tpl
+++ b/sourcepawn/jit/x86/jit_version.tpl
@@ -16,7 +16,7 @@
 #ifndef _INCLUDE_JIT_VERSION_H_
 #define _INCLUDE_JIT_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$LOCAL_BUILD$"
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
 #define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$LOCAL_BUILD$
 
 #endif //_INCLUDE_JIT_VERSION_H_