diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index ad8d844438..73015cca56 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -15,6 +15,9 @@ StepMania 5.0 ????????? | 20110???
   miss combo on next launch. [Wolfman2000]
 * [ScoreKeeperNormal] Better match #COMBOS with eval. Scoring formulas should
   not be affected, but it may require more testing. [Wolfman2000]
+* [Metrics] Have Pump mode lump the checkpoint judgments with Flawless and
+  Miss judgments on eval. Of course, this goes down to Perfect and Miss if
+  that is disabled. [Wolfman2000]
 
 2011/07/07
 ----------
diff --git a/Themes/_fallback/Scripts/03 Gameplay.lua b/Themes/_fallback/Scripts/03 Gameplay.lua
index 90dcc7c88a..3fd0d83e4b 100644
--- a/Themes/_fallback/Scripts/03 Gameplay.lua	
+++ b/Themes/_fallback/Scripts/03 Gameplay.lua	
@@ -105,6 +105,10 @@ function ComboPerRow()
 	end
 end
 
+function EvalUsesCheckpointsWithJudgments()
+	return (GAMESTATE:GetCurrentGame():GetName() == "pump") and true or false
+end
+
 -- these need cleanup really.
 function HitCombo()
 	sGame = GAMESTATE:GetCurrentGame():GetName()
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 3a9db0d6ab..ad995db105 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -3226,7 +3226,7 @@ PrevScreen=Branch.AfterEvaluation()
 LightsMode="LightsMode_MenuStartOnly"
 #
 Summary=false
-CheckpointsWithJudgments=false
+CheckpointsWithJudgments=EvalUsesCheckpointsWithJudgments()
 #
 TimerSeconds=20
 #