diff --git a/aegisub/changelog.txt b/aegisub/changelog.txt
index 7b520c5f4..8df2b69c8 100644
--- a/aegisub/changelog.txt
+++ b/aegisub/changelog.txt
@@ -163,6 +163,8 @@ Please visit http://aegisub.net to download latest version
 - Added a new "Video Details" dialog, that lists some information regarding the currently open video. (demi`)
 - Added support for reading keyframes from xvid pass files. (demi`)
 - Added offsetting support to the resolution resampler. (AMZ)
+- Several fixes to Matroska parsing. (AMZ)
+- Untitled files will now get auto-saved as "Untitled.AUTOSAVE.ass". (AMZ)
 
 
 = 1.10 beta - 2006.08.07 ===========================
diff --git a/aegisub/frame_main_events.cpp b/aegisub/frame_main_events.cpp
index b2eb56077..b5ac8ced2 100644
--- a/aegisub/frame_main_events.cpp
+++ b/aegisub/frame_main_events.cpp
@@ -1457,7 +1457,9 @@ void FrameMain::OnAutoSave(wxTimerEvent &event) {
 			if (!dstpath.DirExists()) wxMkdir(path);
 
 			// Save
-			wxString backup = path + origfile.GetName() + _T(".AUTOSAVE.ass");
+			wxString name = origfile.GetName();
+			if (name.IsEmpty()) name = _T("Untitled");
+			wxString backup = path + origfile.GetName() + name + _T(".AUTOSAVE.ass");
 			AssFile::top->Save(backup,false,false);
 
 			// Set status bar