diff --git a/core/sm_srvcmds.cpp b/core/sm_srvcmds.cpp
index 7df5e42e..cb822e5e 100644
--- a/core/sm_srvcmds.cpp
+++ b/core/sm_srvcmds.cpp
@@ -284,6 +284,7 @@ void RootConsoleMenu::OnRootConsoleCommand(const char *cmdname, const CCommand &
 		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("    Build ID: %s", SM_BUILD_UNIQUEID);
 		ConsolePrint("    http://www.sourcemod.net/");
 	}
 }
diff --git a/core/sm_version.h b/core/sm_version.h
index ae9e7b50..e260cbdb 100644
--- a/core/sm_version.h
+++ b/core/sm_version.h
@@ -40,7 +40,9 @@
  * @file Contains SourceMod version information.
  */
 
-#define SVN_FULL_VERSION	"1.0.3-svn"
-#define SVN_FILE_VERSION	1,0,3,2239
+#define SM_BUILD_STRING		""
+#define SM_BUILD_UNIQUEID	"2533" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.0.4" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,0,4,0
 
 #endif //_INCLUDE_SOURCEMOD_VERSION_H_
diff --git a/core/sm_version.tpl b/core/sm_version.tpl
index 4c92c985..6b28661a 100644
--- a/core/sm_version.tpl
+++ b/core/sm_version.tpl
@@ -40,7 +40,9 @@
  * @file Contains SourceMod version information.
  */
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
+#define SM_BUILD_STRING		"$BUILD_STRING$"
+#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
+#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
 
 #endif //_INCLUDE_SOURCEMOD_VERSION_H_
diff --git a/extensions/bintools/svn_version.h b/extensions/bintools/svn_version.h
index 66d4cc8d..77c770a8 100644
--- a/extensions/bintools/svn_version.h
+++ b/extensions/bintools/svn_version.h
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_BINTOOLS_VERSION_H_
 #define _INCLUDE_BINTOOLS_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.0.3-svn"
-#define SVN_FILE_VERSION	1,0,3,2239
+#define SM_BUILD_STRING		""
+#define SM_BUILD_UNIQUEID	"2533" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.0.4" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,0,4,0
 
 #endif //_INCLUDE_BINTOOLS_VERSION_H_
diff --git a/extensions/bintools/svn_version.tpl b/extensions/bintools/svn_version.tpl
index e3c41e25..603604fc 100644
--- a/extensions/bintools/svn_version.tpl
+++ b/extensions/bintools/svn_version.tpl
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_BINTOOLS_VERSION_H_
 #define _INCLUDE_BINTOOLS_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
+#define SM_BUILD_STRING		"$BUILD_STRING$"
+#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
+#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
 
 #endif //_INCLUDE_BINTOOLS_VERSION_H_
diff --git a/extensions/cstrike/svn_version.h b/extensions/cstrike/svn_version.h
index 8cd1bd43..8d188770 100644
--- a/extensions/cstrike/svn_version.h
+++ b/extensions/cstrike/svn_version.h
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_SDKTOOLS_VERSION_H_
 #define _INCLUDE_SDKTOOLS_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.0.3-svn"
-#define SVN_FILE_VERSION	1,0,3,2239
+#define SM_BUILD_STRING		""
+#define SM_BUILD_UNIQUEID	"2533" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.0.4" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,0,4,0
 
 #endif //_INCLUDE_SDKTOOLS_VERSION_H_
diff --git a/extensions/cstrike/svn_version.tpl b/extensions/cstrike/svn_version.tpl
index 3377580d..fa07e088 100644
--- a/extensions/cstrike/svn_version.tpl
+++ b/extensions/cstrike/svn_version.tpl
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_SDKTOOLS_VERSION_H_
 #define _INCLUDE_SDKTOOLS_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
+#define SM_BUILD_STRING		"$BUILD_STRING$"
+#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
+#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
 
 #endif //_INCLUDE_SDKTOOLS_VERSION_H_
diff --git a/extensions/geoip/svn_version.h b/extensions/geoip/svn_version.h
index c7111ace..c9294706 100644
--- a/extensions/geoip/svn_version.h
+++ b/extensions/geoip/svn_version.h
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_GEOIP_VERSION_H_
 #define _INCLUDE_GEOIP_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.0.3-svn"
-#define SVN_FILE_VERSION	1,0,3,2239
+#define SM_BUILD_STRING		""
+#define SM_BUILD_UNIQUEID	"2533" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.0.4" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,0,4,0
 
 #endif //_INCLUDE_GEOIP_VERSION_H_
diff --git a/extensions/geoip/svn_version.tpl b/extensions/geoip/svn_version.tpl
index d2d1d844..679a3732 100644
--- a/extensions/geoip/svn_version.tpl
+++ b/extensions/geoip/svn_version.tpl
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_GEOIP_VERSION_H_
 #define _INCLUDE_GEOIP_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
+#define SM_BUILD_STRING		"$BUILD_STRING$"
+#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
+#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
 
 #endif //_INCLUDE_GEOIP_VERSION_H_
diff --git a/extensions/mysql/svn_version.h b/extensions/mysql/svn_version.h
index 7a4f502a..c21ab8c8 100644
--- a/extensions/mysql/svn_version.h
+++ b/extensions/mysql/svn_version.h
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_MYSQLEXT_VERSION_H_
 #define _INCLUDE_MYSQLEXT_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.0.3-svn"
-#define SVN_FILE_VERSION	1,0,3,2239
+#define SM_BUILD_STRING		""
+#define SM_BUILD_UNIQUEID	"2533" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.0.4" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,0,4,0
 
 #endif //_INCLUDE_MYSQLEXT_VERSION_H_
diff --git a/extensions/mysql/svn_version.tpl b/extensions/mysql/svn_version.tpl
index 71e37adb..4badc53e 100644
--- a/extensions/mysql/svn_version.tpl
+++ b/extensions/mysql/svn_version.tpl
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_MYSQLEXT_VERSION_H_
 #define _INCLUDE_MYSQLEXT_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
+#define SM_BUILD_STRING		"$BUILD_STRING$"
+#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
+#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
 
 #endif //_INCLUDE_MYSQLEXT_VERSION_H_
diff --git a/extensions/regex/svn_version.h b/extensions/regex/svn_version.h
index 3d70ef60..09a24a35 100644
--- a/extensions/regex/svn_version.h
+++ b/extensions/regex/svn_version.h
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_REGEXEXT_VERSION_H_
 #define _INCLUDE_REGEXEXT_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.0.3-svn"
-#define SVN_FILE_VERSION	1,0,3,2239
+#define SM_BUILD_STRING		""
+#define SM_BUILD_UNIQUEID	"2533" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.0.4" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,0,4,0
 
 #endif //_INCLUDE_REGEXEXT_VERSION_H_
diff --git a/extensions/regex/svn_version.tpl b/extensions/regex/svn_version.tpl
index 3cbf9f19..727d54ce 100644
--- a/extensions/regex/svn_version.tpl
+++ b/extensions/regex/svn_version.tpl
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_REGEXEXT_VERSION_H_
 #define _INCLUDE_REGEXEXT_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
+#define SM_BUILD_STRING		"$BUILD_STRING$"
+#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
+#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
 
 #endif //_INCLUDE_REGEXEXT_VERSION_H_
diff --git a/extensions/sdktools/svn_version.h b/extensions/sdktools/svn_version.h
index 0b3da34f..38aa0f01 100644
--- a/extensions/sdktools/svn_version.h
+++ b/extensions/sdktools/svn_version.h
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_SDKTOOLS_VERSION_H_
 #define _INCLUDE_SDKTOOLS_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.0.3-svn"
-#define SVN_FILE_VERSION	1,0,3,2239
+#define SM_BUILD_STRING		""
+#define SM_BUILD_UNIQUEID	"2533" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.0.4" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,0,4,0
 
 #endif //_INCLUDE_SDKTOOLS_VERSION_H_
diff --git a/extensions/sdktools/svn_version.tpl b/extensions/sdktools/svn_version.tpl
index 2b1e90f2..e197ac1c 100644
--- a/extensions/sdktools/svn_version.tpl
+++ b/extensions/sdktools/svn_version.tpl
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_SDKTOOLS_VERSION_H_
 #define _INCLUDE_SDKTOOLS_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
+#define SM_BUILD_STRING		"$BUILD_STRING$"
+#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
+#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
 
 #endif //_INCLUDE_SDKTOOLS_VERSION_H_
diff --git a/extensions/sqlite/svn_version.h b/extensions/sqlite/svn_version.h
index 4c7cc476..0b7c8635 100644
--- a/extensions/sqlite/svn_version.h
+++ b/extensions/sqlite/svn_version.h
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_SQLITEEXT_VERSION_H_
 #define _INCLUDE_SQLITEEXT_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.0.3-svn"
-#define SVN_FILE_VERSION	1,0,3,2239
+#define SM_BUILD_STRING		""
+#define SM_BUILD_UNIQUEID	"2533" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.0.4" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,0,4,0
 
 #endif //_INCLUDE_SQLITEEXT_VERSION_H_
diff --git a/extensions/sqlite/svn_version.tpl b/extensions/sqlite/svn_version.tpl
index 6d073779..566c386c 100644
--- a/extensions/sqlite/svn_version.tpl
+++ b/extensions/sqlite/svn_version.tpl
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_SQLITEEXT_VERSION_H_
 #define _INCLUDE_SQLITEEXT_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
+#define SM_BUILD_STRING		"$BUILD_STRING$"
+#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
+#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
 
 #endif //_INCLUDE_SQLITEEXT_VERSION_H_
diff --git a/extensions/tf2/svn_version.h b/extensions/tf2/svn_version.h
index 3d0a5996..3f273c9b 100644
--- a/extensions/tf2/svn_version.h
+++ b/extensions/tf2/svn_version.h
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_SDKTOOLS_VERSION_H_
 #define _INCLUDE_SDKTOOLS_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.0.3-svn"
-#define SVN_FILE_VERSION	1,0,3,2239
+#define SM_BUILD_STRING		""
+#define SM_BUILD_UNIQUEID	"2533" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.0.4" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,0,4,0
 
 #endif //_INCLUDE_SDKTOOLS_VERSION_H_
diff --git a/extensions/tf2/svn_version.tpl b/extensions/tf2/svn_version.tpl
index d8f49c12..bf0be39f 100644
--- a/extensions/tf2/svn_version.tpl
+++ b/extensions/tf2/svn_version.tpl
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_SDKTOOLS_VERSION_H_
 #define _INCLUDE_SDKTOOLS_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
+#define SM_BUILD_STRING		"$BUILD_STRING$"
+#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
+#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
 
 #endif //_INCLUDE_SDKTOOLS_VERSION_H_
diff --git a/extensions/topmenus/svn_version.h b/extensions/topmenus/svn_version.h
index caace500..312c373c 100644
--- a/extensions/topmenus/svn_version.h
+++ b/extensions/topmenus/svn_version.h
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_SQLITEEXT_VERSION_H_
 #define _INCLUDE_SQLITEEXT_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.0.3-svn"
-#define SVN_FILE_VERSION	1,0,3,2239
+#define SM_BUILD_STRING		""
+#define SM_BUILD_UNIQUEID	"2533" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.0.4" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,0,4,0
 
 #endif //_INCLUDE_SQLITEEXT_VERSION_H_
diff --git a/extensions/topmenus/svn_version.tpl b/extensions/topmenus/svn_version.tpl
index 86ee8200..9405f327 100644
--- a/extensions/topmenus/svn_version.tpl
+++ b/extensions/topmenus/svn_version.tpl
@@ -36,7 +36,9 @@
 #ifndef _INCLUDE_SQLITEEXT_VERSION_H_
 #define _INCLUDE_SQLITEEXT_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
+#define SM_BUILD_STRING		"$BUILD_STRING$"
+#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
+#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
 
 #endif //_INCLUDE_SQLITEEXT_VERSION_H_
diff --git a/loader/svn_version.h b/loader/svn_version.h
index 0127c12a..e260cbdb 100644
--- a/loader/svn_version.h
+++ b/loader/svn_version.h
@@ -40,7 +40,9 @@
  * @file Contains SourceMod version information.
  */
 
-#define SVN_FULL_VERSION	"1.0.3.2239"
-#define SVN_FILE_VERSION	1,0,3,2239
+#define SM_BUILD_STRING		""
+#define SM_BUILD_UNIQUEID	"2533" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.0.4" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,0,4,0
 
 #endif //_INCLUDE_SOURCEMOD_VERSION_H_
diff --git a/loader/svn_version.tpl b/loader/svn_version.tpl
index c9d0c6a3..6b28661a 100644
--- a/loader/svn_version.tpl
+++ b/loader/svn_version.tpl
@@ -40,7 +40,9 @@
  * @file Contains SourceMod version information.
  */
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
+#define SM_BUILD_STRING		"$BUILD_STRING$"
+#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
+#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
 
 #endif //_INCLUDE_SOURCEMOD_VERSION_H_
diff --git a/plugins/include/version.inc b/plugins/include/version.inc
index f7b9f31c..3d312da0 100644
--- a/plugins/include/version.inc
+++ b/plugins/include/version.inc
@@ -37,6 +37,6 @@
 
 #define SOURCEMOD_V_MAJOR		1				/**< SourceMod Major version */
 #define SOURCEMOD_V_MINOR		0				/**< SourceMod Minor version */
-#define SOURCEMOD_V_RELEASE		3				/**< SourceMod Release version */
+#define SOURCEMOD_V_RELEASE		4				/**< SourceMod Release version */
 
-#define SOURCEMOD_VERSION		"1.0.3-svn"	/**< SourceMod version string (major.minor.release.build) */
+#define SOURCEMOD_VERSION	"1.0.4"	/**< SourceMod version string (major.minor.release.build) */
diff --git a/plugins/include/version.tpl b/plugins/include/version.tpl
index f9a7db36..a09b9866 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$-svn"	/**< SourceMod version string (major.minor.release.build) */
+#define SOURCEMOD_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$$BUILD_STRING$"	/**< SourceMod version string (major.minor.release.build) */
diff --git a/sourcepawn/compiler/svn_version.h b/sourcepawn/compiler/svn_version.h
index 5024070a..36ecc021 100644
--- a/sourcepawn/compiler/svn_version.h
+++ b/sourcepawn/compiler/svn_version.h
@@ -19,7 +19,9 @@
  * @file Contains SourceMod version information.
  */
 
-#define SVN_FULL_VERSION	"1.0.3-svn"
-#define SVN_FILE_VERSION	1,0,3,2232
+#define SM_BUILD_STRING		""
+#define SM_BUILD_UNIQUEID	"2533" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.0.4" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,0,4,0
 
 #endif //_INCLUDE_SOURCEMOD_VERSION_H_
diff --git a/sourcepawn/compiler/svn_version.tpl b/sourcepawn/compiler/svn_version.tpl
index c74e8570..902b4393 100644
--- a/sourcepawn/compiler/svn_version.tpl
+++ b/sourcepawn/compiler/svn_version.tpl
@@ -19,7 +19,9 @@
  * @file Contains SourceMod version information.
  */
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$LOCAL_BUILD$
+#define SM_BUILD_STRING		"$BUILD_STRING$"
+#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
+#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
 
 #endif //_INCLUDE_SOURCEMOD_VERSION_H_
diff --git a/sourcepawn/jit/x86/jit_version.h b/sourcepawn/jit/x86/jit_version.h
index ea132b05..95111d55 100644
--- a/sourcepawn/jit/x86/jit_version.h
+++ b/sourcepawn/jit/x86/jit_version.h
@@ -16,7 +16,9 @@
 #ifndef _INCLUDE_JIT_VERSION_H_
 #define _INCLUDE_JIT_VERSION_H_
 
-#define SVN_FULL_VERSION	"1.0.3-svn"
-#define SVN_FILE_VERSION	1,0,3,2232
+#define SM_BUILD_STRING		""
+#define SM_BUILD_UNIQUEID	"2533" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"1.0.4" SM_BUILD_STRING
+#define SVN_FILE_VERSION	1,0,4,0
 
 #endif //_INCLUDE_JIT_VERSION_H_
diff --git a/sourcepawn/jit/x86/jit_version.tpl b/sourcepawn/jit/x86/jit_version.tpl
index a955cd86..7c0199b3 100644
--- a/sourcepawn/jit/x86/jit_version.tpl
+++ b/sourcepawn/jit/x86/jit_version.tpl
@@ -16,7 +16,9 @@
 #ifndef _INCLUDE_JIT_VERSION_H_
 #define _INCLUDE_JIT_VERSION_H_
 
-#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$-svn"
-#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,$LOCAL_BUILD$
+#define SM_BUILD_STRING		"$BUILD_STRING$"
+#define SM_BUILD_UNIQUEID	"$BUILD_ID$" SM_BUILD_STRING
+#define SVN_FULL_VERSION	"$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
+#define SVN_FILE_VERSION	$PMAJOR$,$PMINOR$,$PREVISION$,0
 
 #endif //_INCLUDE_JIT_VERSION_H_
diff --git a/tools/buildbot/bootstrap.pl b/tools/buildbot/bootstrap.pl
index 71ed1a65..6c4ba96a 100755
--- a/tools/buildbot/bootstrap.pl
+++ b/tools/buildbot/bootstrap.pl
@@ -57,4 +57,4 @@ if ($^O eq "linux")
     Build::Command("flip -u tools/versionchanger.pl");
     Build::Command("chmod +x tools/versionchanger.pl");
 }
-Build::Command(Build::PathFormat('tools/versionchanger.pl'));
+Build::Command(Build::PathFormat('tools/versionchanger.pl') . ' --buildstring="-dev"');
diff --git a/tools/versionchanger.pl b/tools/versionchanger.pl
index a8457e93..d12c1b00 100644
--- a/tools/versionchanger.pl
+++ b/tools/versionchanger.pl
@@ -1,165 +1,169 @@
-#!/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;
-}
+#!/usr/bin/perl
+
+our %arguments =
+(
+	'config' => 'modules.versions',
+	'major' => '1',
+	'minor' => '0',
+	'revision' => '0',
+	'build' => undef,
+	'svnrev' => 'global',
+	'path' => '',
+	'buildstring' => '',
+);
+
+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'};
+my $buildstr = $arguments{'buildstring'};
+
+#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;
+		s/\$BUILD_ID\$/$rev/g;
+		s/\$BUILD_STRING\$/$buildstr/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;
+}