diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 51ae1cbde6..d2e2b127ef 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -5,7 +5,7 @@ from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
 ________________________________________________________________________________
 
 ================================================================================
-StepMania 5.0 Preview 2 | 201106??
+StepMania 5.0 Preview 2 | 201107??
 --------------------------------------------------------------------------------
 
 2011/06/30
@@ -13,6 +13,9 @@ StepMania 5.0 Preview 2 | 201106??
 * [NotesAll] Use #FIRSTSECOND, #LASTSECOND, and #LASTSECONDHINT instead of the
   former BEAT equivalents. Split Timing has made this a necessity thanks to
   certain files that abuse Stops/Delays more than usual. [Wolfman2000]
+* [ScreenEdit] Add a function in the Area Menu to designate the current beat
+  as the last second of the song. Please try to be smart and not use this too
+  early. [Wolfman2000]
 
 2011/06/28
 ----------
diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index e9f39cb930..adbb6deadc 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -838,6 +838,7 @@ Delete=Delete
 Delete beat and shift up=Delete beat and shift up
 Description=Description
 Designate as Music Preview=Designate as Music Preview
+Designate last second at current beat=Designate last second at current beat
 Difficulty=Difficulty
 Display BPM=Display BPM
 DisplayAspectRatio=Aspect Ratio
diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp
index 6d6b21f4e5..4de9d3ede2 100644
--- a/src/ScreenEdit.cpp
+++ b/src/ScreenEdit.cpp
@@ -581,8 +581,9 @@ static MenuDef g_AreaMenu(
 	     EditMode_Full, true, true, 0, NULL ),
 	MenuRowDef(ScreenEdit::convert_delay_to_beat, "Convert delay to beats",		true,
 	     EditMode_Full, true, true, 0, NULL ),
+	  MenuRowDef(ScreenEdit::last_second_at_beat,	"Designate last second at current beat", true, EditMode_Full, true, true, 0, NULL ),
 	MenuRowDef( ScreenEdit::undo,			"Undo",					true, EditMode_Practice, true, true, 0, NULL ),
-  MenuRowDef(ScreenEdit::clear_clipboard,		"Clear clipboard",			true,
+	MenuRowDef(ScreenEdit::clear_clipboard,		"Clear clipboard",			true,
 	     EditMode_Practice, true, true, 0, NULL )
 			  
 );
@@ -4129,6 +4130,13 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, const vector<int> &iAns
 			timing.InsertRows(GetRow(), BeatToNoteRow(pauseBeats));
 			break;
 		}
+		case last_second_at_beat:
+		{
+			TimingData &timing = GetAppropriateTiming();
+			Song &s = *GAMESTATE->m_pCurSong;
+			s.specifiedLastSecond = timing.GetElapsedTimeFromBeat(GetBeat());
+			break;
+		}
 		case undo:
 			Undo();
 			break;
diff --git a/src/ScreenEdit.h b/src/ScreenEdit.h
index e75a4a854f..a2392a83e6 100644
--- a/src/ScreenEdit.h
+++ b/src/ScreenEdit.h
@@ -421,6 +421,7 @@ public:
 		shift_pauses_backward,
 		convert_pause_to_beat,
 		convert_delay_to_beat,
+		last_second_at_beat,
 		undo,
 		clear_clipboard,
 		NUM_AREA_MENU_CHOICES