diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp
index b156bf81ec..4c48d2709e 100644
--- a/stepmania/src/RageLog.cpp
+++ b/stepmania/src/RageLog.cpp
@@ -14,6 +14,8 @@
 #include "StepMania.h"
 #include "RageLog.h"
 #include "RageUtil.h"
+#include "RageTimer.h"
+#include "PrefsManager.h"
 #include <fstream>
 #include <time.h>
 
@@ -145,6 +147,9 @@ void RageLog::Warn( const char *fmt, ...)
 /* When */
 void RageLog::Write( int where, CString str)
 {
+	if( PREFSMAN && PREFSMAN->m_bTimestamping )
+		str = SecondsToTime(RageTimer::GetTimeSinceStart()) + ": " + str;
+
 	if( where&WRITE_TO_INFO && m_fileInfo )
 		fprintf(m_fileInfo, "%s\n", str.GetString() );
 
diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index ff5ca1949b..6ca0eae32a 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -57,6 +57,14 @@ ScreenManager::ScreenManager()
 	m_textSystemMessage.SetZoom( 0.7f );
 //	m_textSystemMessage.SetShadowLength( 2 );
 	m_textSystemMessage.SetDiffuse( RageColor(1,1,1,0) );
+
+	m_textSysTime.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textSysTime.SetXY( 4.0f, 40.0f );
+	m_textSysTime.SetHorizAlign( Actor::align_left );
+	m_textSysTime.SetVertAlign( Actor::align_top );
+	m_textSysTime.SetZoom( 0.5f );
+	m_textSysTime.SetDiffuse( RageColor(1,0,1,1) );
+	m_textSysTime.EnableShadow(false);
 }
 
 
@@ -87,6 +95,7 @@ void ScreenManager::Update( float fDeltaTime )
 	m_textStats.Update( fDeltaTime );
 	for( int p=0; p<NUM_PLAYERS; p++ )
 		m_textCreditInfo[p].Update( fDeltaTime );
+	m_textSysTime.Update( fDeltaTime );
 
 	EmptyDeleteQueue();
 
@@ -152,6 +161,11 @@ void ScreenManager::Draw()
 	for( int p=0; p<NUM_PLAYERS; p++ )
 		m_textCreditInfo[p].Draw();
 
+	if(PREFSMAN->m_bTimestamping)
+	{
+		m_textSysTime.SetText( SecondsToTime(RageTimer::GetTimeSinceStart()) );
+		m_textSysTime.Draw();
+	}
 }
 
 
diff --git a/stepmania/src/ScreenManager.h b/stepmania/src/ScreenManager.h
index 4273a7eefd..28ff84a879 100644
--- a/stepmania/src/ScreenManager.h
+++ b/stepmania/src/ScreenManager.h
@@ -59,7 +59,8 @@ private:
 	BitmapText m_textStats;
 	BitmapText m_textSystemMessage;
 	BitmapText m_textCreditInfo[NUM_PLAYERS];
-
+	BitmapText m_textSysTime;
+	
 	Screen* MakeNewScreen( CString sClassName );
 	void EmptyDeleteQueue();
 	void SetNewScreen( Screen *pNewScreen );