diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index 7a152e09e..4a0bb71e4 100644
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -1595,6 +1595,7 @@ monster priests and wizards did not cast spells
 prevent phaseable monsters hiding deep inside nondiggable walls
 blessed potion of see invisible does not guarantee the intrinsic
 prevent selecting all options in #optionsfull menu
+shapeshifters change shape less
 
 
 Fixes to 3.7.0-x General Problems Exposed Via git Repository
diff --git a/src/mon.c b/src/mon.c
index a245757be..789ca8276 100644
--- a/src/mon.c
+++ b/src/mon.c
@@ -4878,8 +4878,10 @@ decide_to_shapeshift(struct monst *mon)
 
     if (!is_vampshifter(mon)) {
         /* regular shapeshifter; 'ptr' is Null */
-        if (!rn2(6))
+        if (!mon->mspec_used && !rn2(6)) {
             dochng = TRUE;
+            mon->mspec_used = 3 + rn2(10);
+        }
     } else if (!(mon->mstrategy & STRAT_WAITFORU)) {
         /* The vampire has to be in good health (mhp) to maintain
          * its shifted form.