diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2c51fc950c..b96386cf79 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.
 
 2006/05/01
+	* Fixed pc_disguise not allowing you to "redisguise". [Skotlex]
 	* Corrected a crash when sd is null in npc_event [Skotlex]
 	* After testing to make sure it works properly, I'm including
 	  new battle conf options to limit MVP drops. [Reddozen]
diff --git a/src/map/pc.c b/src/map/pc.c
index da385ffcb8..b58c7d6247 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1092,7 +1092,7 @@ int pc_checkweighticon(struct map_session_data *sd)
 int pc_disguise(struct map_session_data *sd, int class_) {
 	if (!class_ && !sd->disguise)
 		return 0;
-	if (class_ && (sd->disguise || pc_isriding(sd)))
+	if (class_ && (sd->disguise == class_ || pc_isriding(sd)))
 		return 0;
 
 	pc_stop_walking(sd, 0);