diff --git a/BizHawk.Client.Common/SavestateManager.cs b/BizHawk.Client.Common/SavestateManager.cs
index 0cc11ec34a..58885a8b0d 100644
--- a/BizHawk.Client.Common/SavestateManager.cs
+++ b/BizHawk.Client.Common/SavestateManager.cs
@@ -72,6 +72,15 @@ namespace BizHawk.Client.Common
 							tw.WriteLine(data);
 						});
 				}
+
+				if (Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie is TasMovie)
+				{
+					bs.PutLump(BinaryStateLump.LagLog,
+						delegate(BinaryWriter bw)
+						{
+							(Global.MovieSession.Movie as TasMovie).TasLagLog.Save(bw);
+						});
+				}
 			}
 		}
 
@@ -146,6 +155,15 @@ namespace BizHawk.Client.Common
 
 						Global.UserBag = (Dictionary<string, object>)ConfigService.LoadWithType(userData);
 					}
+
+					if (bl.HasLump(BinaryStateLump.LagLog)
+						&& Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie is TasMovie)
+					{
+						bl.GetLump(BinaryStateLump.LagLog, false, delegate(BinaryReader br, long length)
+						{
+							(Global.MovieSession.Movie as TasMovie).TasLagLog.Load(br);
+						});
+					}
 				}
 				catch
 				{
diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
index 0c0948cd18..d7bdbc49df 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
@@ -74,6 +74,8 @@ namespace BizHawk.Client.Common
 			BindMarkersToInput = true;
 		}
 
+		public TasLagLog TasLagLog { get { return LagLog; } }
+
 		public TasMovieMarkerList Markers { get; set; }
 		public bool BindMarkersToInput { get; set; }
 		public bool UseInputCache { get; set; }