diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 9de5148811..41664eb3e3 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EV
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
 2006/03/07
+	* Added Gunslinger and Ninja into @job. of course, you need latest EXE
+	  for make this work... and of course no skills yet! [Vicious]
 	* Storm Gust now knocks back on a random direction instead of away from the
 	  storm. [Skotlex]
 2006/03/06
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index b30438975b..d517cc9e65 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2217,6 +2217,9 @@ int atcommand_jobchange(
 			{ "dancer",		20 },
 			{ "super novice",	23 },
 			{ "supernovice",	23 },
+			{ "gunslinger",	24 },
+			{ "gunner",	24 },
+			{ "ninja",	25 },
 			{ "high novice",	4001 },
 			{ "swordsman high",	4002 },
 			{ "mage high",		4003 },