diff --git a/src/NotesWriterSSC.cpp b/src/NotesWriterSSC.cpp
index c736104ae8..3f6acabab2 100644
--- a/src/NotesWriterSSC.cpp
+++ b/src/NotesWriterSSC.cpp
@@ -144,7 +144,7 @@ static void WriteGlobalTags( RageFile &f, const Song &out )
 	}
 	f.PutLine( ";" );
 
-	/*
+	
 	f.Write( "#WARPS:" );
 	for( unsigned i=0; i<out.m_Timing.m_WarpSegments.size(); i++ )
 	{
@@ -155,7 +155,7 @@ static void WriteGlobalTags( RageFile &f, const Song &out )
 			f.Write( "," );
 	}
 	f.PutLine( ";" );
-	*/
+	
 
 	ASSERT( !out.m_Timing.m_vTimeSignatureSegments.empty() );
 	f.Write( "#TIMESIGNATURES:" );
@@ -299,6 +299,7 @@ static RString GetSSCNoteData( const Song &song, const Steps &in, bool bSavingCa
 	lines.push_back( "#BPMS:;" );
 	lines.push_back( "#STOPS:;" );
 	lines.push_back( "#DELAYS:;" );
+	lines.push_back( "#WARPS:;" );
 	lines.push_back( "#TIMESIGNATURES:;" );
 	lines.push_back( "#TICKCOUNTS:;" );
 	lines.push_back( "#ATTACKS:;" );
@@ -336,7 +337,19 @@ static RString GetSSCNoteData( const Song &song, const Steps &in, bool bSavingCa
 		}
 	}
 	lines.push_back( ssprintf( "#DELAYS:%s;", join("\n,", asDelayValues).c_str() ) );
-
+	
+	vector<RString> asWarpValues;
+	for( unsigned i=0; i<in.m_Timing.m_WarpSegments.size(); i++ )
+	{
+		const WarpSegment &ws = in.m_Timing.m_WarpSegments[i];
+		
+		if( ws.m_bDelay )
+		{
+			asWarpValues.push_back( ssprintf( "%.6f=%.6f", NoteRowToBeat(fs.m_iStartRow), fs.m_fWarpBeats ) );
+		}
+	}
+	lines.push_back( ssprintf( "#WARPS:%s;", join("\n,", asWarpValues).c_str() ) );
+	
 	ASSERT( !in.m_Timing.m_vTimeSignatureSegments.empty() );
 	vector<RString> asTimeSigValues;
 	FOREACH_CONST( TimeSignatureSegment, in.m_Timing.m_vTimeSignatureSegments, iter )