diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index bb8b3960a..c9e8c7ca4 100644
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -988,6 +988,8 @@ if an item-using monster zaps a wand of digging downward on a level that
 	doesn't allow holes but does allow pits, create a pit and trigger it
 no longer override the effect of a new moon by simply carring a lizard corpse
 make explosions burn monster's armor just like they do hero's armor
+make healing and extra healing better by upping the average amount healed
+lifesaving healing amount depends on the consitution
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
diff --git a/src/end.c b/src/end.c
index 14322f931..2c5d802c5 100644
--- a/src/end.c
+++ b/src/end.c
@@ -903,6 +903,7 @@ static void
 savelife(int how)
 {
     int uhpmin;
+    int givehp = 50 + 10 * (ACURR(A_CON) / 2);
 
     /* life-drain/level-loss to experience level 0 kills without actually
        reducing ulevel below 1, but include this for bulletproofing */
@@ -911,9 +912,9 @@ savelife(int how)
     uhpmin = minuhpmax(10);
     if (u.uhpmax < uhpmin)
         setuhpmax(uhpmin);
-    u.uhp = u.uhpmax;
+    u.uhp = min(u.uhpmax, givehp);
     if (Upolyd) /* Unchanging, or death which bypasses losing hit points */
-        u.mh = u.mhmax;
+        u.mh = min(u.mhmax, givehp);
     if (u.uhunger < 500 || how == CHOKING) {
         init_uhunger();
     }
diff --git a/src/potion.c b/src/potion.c
index aad297451..f8951fa6b 100644
--- a/src/potion.c
+++ b/src/potion.c
@@ -1099,7 +1099,7 @@ static void
 peffect_healing(struct obj *otmp)
 {
     You_feel("better.");
-    healup(d(6 + 2 * bcsign(otmp), 4), !otmp->cursed ? 1 : 0,
+    healup(8 + d(4 + 2 * bcsign(otmp), 4), !otmp->cursed ? 1 : 0,
            !!otmp->blessed, !otmp->cursed);
     exercise(A_CON, TRUE);
 }
@@ -1108,7 +1108,7 @@ static void
 peffect_extra_healing(struct obj *otmp)
 {
     You_feel("much better.");
-    healup(d(6 + 2 * bcsign(otmp), 8),
+    healup(16 + d(4 + 2 * bcsign(otmp), 8),
            otmp->blessed ? 5 : !otmp->cursed ? 2 : 0, !otmp->cursed,
            TRUE);
     (void) make_hallucinated(0L, TRUE, 0L);