diff --git a/db/Changelog.txt b/db/Changelog.txt
index cbb797d8bd..7ad9d6740e 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -20,6 +20,8 @@
 
 =========================
 08/15
+	* Fixed disarm not working [Playtester]
+	- also fixed duration of Gatling Fever
 	* Made Kiel MVP's skills non-cancelable [Playtester]
 	* Fixed Masamune and Kamaitachi using bAspd rather than bAspdRate [Playtester]
 08/14
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index dc5769b36b..dde90feafa 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -869,7 +869,7 @@
 //-- GS_DESPERADO
 516,0,1000,1000,1000,0
 //-- GS_GATLINGFEVER
-517,0,1000,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:160000,0
+517,0,1000,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,0
 //-- GS_DUST
 518,1000,1000,0,0,0
 //-- GS_FULLBUSTER
diff --git a/db/skill_db.txt b/db/skill_db.txt
index d75aea19e7..e766c7d0da 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -537,7 +537,7 @@
 510,0,0,0,0,0,0,10,0,no,0,0,0,none,0	//GS_SNAKEEYE#Snake Eye#
 511,-3,8,0,0,0,0,10,2,no,0,0,0,weapon,0	//GS_CHAINACTION#Chain Action#
 512,3,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_TRACKING#Tracking#
-513,7,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//GS_DISARM#Disarm#
+513,7,6,1,-1,1,0,5,1,no,0,0,0,weapon,0	//GS_DISARM#Disarm#
 514,3,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//GS_PIERCINGSHOT#Piercing Shot#
 515,3,8,1,-1,0,0,10,5,no,0,0,0,weapon,0	//GS_RAPIDSHOWER#Rapid Shower#
 516,0,8,4,-1,2,3,10,1,no,0,0,0,weapon,0	//GS_DESPERADO#Desperado#