diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 5744c88182..6efe21b936 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2006/11/09
+=======
+	* Fixed Health Conversion skill formula bug. [Lupus]
 2006/11/08
 	* Fixed Desperado's hit-rate, now it behaves as it should. [Skotlex]
 	* The GVG map-packet will now also be sent for guild dungeon maps.
diff --git a/src/map/skill.c b/src/map/skill.c
index 5c1c6448d7..c590200026 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4990,7 +4990,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 		{
 			int hp, sp;
 			hp = sstatus->max_hp/10;
-			sp = hp * 10 * skilllv / 100;
+			sp = hp + (hp * 10 * skilllv) / 100;
 			if (!status_charge(src,hp,0)) {
 				if (sd) clif_skill_fail(sd,skillid,0,0);
 				break;