diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index e767682434..01c0bae560 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,7 @@ 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/15
+	* Likely fixed Gravitation not hitting except for the last hit. [Skotlex]
 	* Removed the hardcoded duration of 30 seconds for sleep. [Skotlex]
 	* Fixed rangecheck for pet skill usage of INF_SELF_SKILL type of skills
 	  [Skotlex]
diff --git a/src/map/status.c b/src/map/status.c
index ff1eb1fd05..743cde2c78 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -403,7 +403,7 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
 			(sc->data[SC_TRICKDEAD].timer != -1 && skill_num != NV_TRICKDEAD)
 			|| (sc->data[SC_AUTOCOUNTER].timer != -1 && skill_num != KN_AUTOCOUNTER)
 			|| (sc->data[SC_GOSPEL].timer != -1 && sc->data[SC_GOSPEL].val4 == BCT_SELF && skill_num != PA_GOSPEL)
-			|| (sc->data[SC_GRAVITATION].timer != -1 && sc->data[SC_GRAVITATION].val3 == BCT_SELF)
+			|| (sc->data[SC_GRAVITATION].timer != -1 && sc->data[SC_GRAVITATION].val3 == BCT_SELF && skill_num != HW_GRAVITATION)
 		)
 			return 0;
 
@@ -4399,6 +4399,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 		case SC_QUAGMIRE:			/* クァグマイア */
 			calc_flag = 1;
 			break;
+
 		case SC_LULLABY:			/* 子守唄 */
 		case SC_RICHMANKIM:
 		case SC_ROKISWEIL:			/* ロキの叫び */
@@ -4451,6 +4452,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 		case SC_SILENCE:			/* 沈?（レックスデビ?ナ） */
 		case SC_ASSUMPTIO:		/* アスムプティオ */
 		case SC_SLEEP:
+			break;
 		// gs_something1 [Vicious]
 		case SC_MADNESSCANCEL:
 		case SC_ADJUSTMENT: