diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index a5370c4746..26f2c988c0 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -5,9 +5,14 @@ from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
 ________________________________________________________________________________
 
 ================================================================================
-StepMania 5.0 Preview 2 | 20110???
+StepMania 5.0 Preview 2 | 201106??
 --------------------------------------------------------------------------------
 
+2011/06/17
+----------
+* [LifeMeterBattery] Fixed a bug where MinesSubtractLives was not being honored.
+  Also added LifeChanged message to changing of life on holds. [AJ]
+
 2011/06/15
 ----------
 * [TimingData] Added many lua bindings for the other timing segments. GetWarps,
diff --git a/src/LifeMeterBattery.cpp b/src/LifeMeterBattery.cpp
index 20f42ff4e7..3f49487a17 100644
--- a/src/LifeMeterBattery.cpp
+++ b/src/LifeMeterBattery.cpp
@@ -155,7 +155,7 @@ void LifeMeterBattery::ChangeLife( TapNoteScore score )
 		SubtractLives(MINES_SUBTRACT_LIVES);
 	else
 	{
-		if( score < MIN_SCORE_TO_KEEP_LIFE && SUBTRACT_LIVES > 0 )
+		if( score < MIN_SCORE_TO_KEEP_LIFE && score > TNS_CheckpointMiss && SUBTRACT_LIVES > 0 )
 			SubtractLives(SUBTRACT_LIVES);
 	}
 
@@ -175,6 +175,12 @@ void LifeMeterBattery::ChangeLife( HoldNoteScore score, TapNoteScore tscore )
 		AddLives(HELD_ADD_LIVES);
 	if( score == HNS_LetGo && LET_GO_SUBTRACT_LIVES > 0 )
 		SubtractLives(LET_GO_SUBTRACT_LIVES);
+
+	Message msg( "LifeChanged" );
+	msg.SetParam( "Player", m_pPlayerState->m_PlayerNumber );
+	msg.SetParam( "LifeMeter", LuaReference::CreateFromPush(*this) );
+	msg.SetParam( "LivesLeft", GetLivesLeft() );
+	MESSAGEMAN->Broadcast( msg );
 }
 
 void LifeMeterBattery::HandleTapScoreNone()