diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index ddaeaf76ac..45db12aa6b 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2008/04/07
+	* Rev. 12529 Updated MAX_GUARDIANS to support an insane amount of guardians. [L0ne_W0lf]
 	* Immunity to magic now makes you immune to the SC effect as well. (r12527) [Kevin]
 	* Made script command 'flagemblem' and guild_emblem_change send an update 
 	  of the emblem_id to the players in the area.
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 1c3d1e53a7..d246fd02c9 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -49,7 +49,7 @@
 #define MAX_GUILDSKILL	15 // increased max guild skills because of new skills [Sara-chan]
 #define MAX_GUILDCASTLE 34	// Updated to include new entries for WoE:SE. [L0ne_W0lf]
 #define MAX_GUILDLEVEL 50
-#define MAX_GUARDIANS 8	//Local max per castle. [Skotlex]
+#define MAX_GUARDIANS 46	//Local max per castle. [Skotlex]
 
 #define MIN_HAIR_STYLE battle_config.min_hair_style
 #define MAX_HAIR_STYLE battle_config.max_hair_style
diff --git a/src/map/clif.h b/src/map/clif.h
index 382e399bb6..a52a155d6a 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -37,7 +37,7 @@ struct guild;
 // v8 - 2007-05-21aSakexe+ - 0x283
 // v9 - 2007-11-06aSakexe+ - 0x78, 0x7c, 0x22c
 #ifndef PACKETVER
-	#define PACKETVER	9
+	#define PACKETVER	8
 #endif
 
 // packet DB