diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index d7e2e11645..9710c93425 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -33,6 +33,8 @@ KarLaeda
 
 Date		Added
 ======
+11/05
+	* Fixed reward of gunslinger job quest [Playtester]
 11/04
 	* Many small fixes - tabs, parenthesis [KarLaeda]
 	* Fixed Weight check in 1st class quests [Lupus]
diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt
index 0539f1f2cc..47da548661 100644
--- a/npc/jobs/1-1e/gunslinger.txt
+++ b/npc/jobs/1-1e/gunslinger.txt
@@ -7,7 +7,7 @@
 //= DON'T REMOVE THIS! (by request of him, he provided all
 //= the info regarding the quests and shops.)
 //===== Current Version: ===================================== 
-//= 1.7b
+//= 1.8
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -22,6 +22,7 @@
 //= 1.7 Now uses only ONE variable GUNS_Q [Lupus]
 //= 1.7a Grammar fixes, few spelling fixes, etc [CBMaster]
 //= 1.7b Parenthesis fixes [KarLaeda]
+//= 1.8 Fixed the reward you can get [Playtester]
 //============================================================ 
 
 que_ng.gat,152,167,3	script	Gunslinger Jobchanger	901,{
@@ -56,7 +57,11 @@ que_ng.gat,152,167,3	script	Gunslinger Jobchanger	901,{
 				next;
 				mes @npcname$;
 				mes "Oh, I forgot, here's a token of my appreciation";
-				getitem 13150,1;
+				if (rand(1,3) < 3) {
+					getitem 13100,1;
+				} else {
+					getitem 13150,1;
+				}
 				close2;
 				set @npcname$,"";
 				end;