diff --git a/db/mob_classchange.txt b/db/mob_classchange.txt
new file mode 100644
index 0000000000..3a56c03e05
--- /dev/null
+++ b/db/mob_classchange.txt
@@ -0,0 +1,30 @@
+// SA_CLASSCHANGE Summonable Monsters Database
+//
+// Structure of Database:
+// MobID,DummyName,Rate
+
+0,Baphomet,1039
+1038,Osiris,1000000
+1039,Baphomet,1000000
+1046,Doppelganger,1000000
+1059,Mistress,1000000
+1086,Golden Thief Bug,1000000
+1087,Orc Hero,1000000
+1112,Drake,1000000
+1115,Eddga,1000000
+1147,Maya,1000000
+1150,Moonlight Flower,1000000
+1157,Pharaoh,1000000
+1159,Phreeoni,1000000
+1190,Orc Lord,1000000
+1251,Stormy Knight,1000000
+1252,Garm,1000000
+1272,Dark Lord,1000000
+1312,Turtle General,1000000
+1373,Lord of the Dead,1000000
+1388,Arc Angeling,1000000
+1389,Dracula,1000000
+1418,Evil Snake Lord,1000000
+1492,Samurai Specter,1000000
+1511,Amon Ra,1000000
+1583,Tao Gunka,1000000
diff --git a/src/map/mob.c b/src/map/mob.c
index 7d02bbc272..5dd6366892 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -3981,7 +3981,8 @@ static int mob_read_randommonster(void)
 		DBPATH"mob_branch.txt",
 		"mob_poring.txt",
 		DBPATH"mob_boss.txt",
-		"mob_pouch.txt"};
+		"mob_pouch.txt",
+		"mob_classchange.txt"};
 
 	memset(&summon, 0, sizeof(summon));
 
diff --git a/src/map/skill.c b/src/map/skill.c
index 7ed6be7c5c..f6aef06a21 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4883,7 +4883,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 				clif_skill_fail(sd,skillid,USESKILL_FAIL_LEVEL,0);
 				break;
 			}
-			class_ = skillid==SA_MONOCELL?1002:mob_get_random_id(2, 1, 0);
+			class_ = skillid==SA_MONOCELL?1002:mob_get_random_id(4, 1, 0);
 			clif_skill_nodamage(src,bl,skillid,skilllv,1);
 			mob_class_change(dstmd,class_);
 			if( tsc && dstmd->status.mode&MD_BOSS )