diff --git a/changelog.txt b/changelog.txt
index 9a52e56f..330ad292 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,5 @@
+24-may-2010 - mart0258 - Disable auto-savestates during turbo
+24-may-2010 - mart0258 - Prevent .zip files containing no recognized files from causing crash
 23-may-2010 - adelikat - Win32 - Replay dialog - fix bug that was causing it to always report savestate movies as soft-reset
 23-may-2010 - adelikat - Fix PlayMovieFromBeginning when using a movie that starts from savestate
 23-may-2010 - cah4e3  - mapper 19 savestate fix mirroring for "Dream Master (J)" corrected to "four-screen" by CRC check
diff --git a/src/fceu.cpp b/src/fceu.cpp
index 7d34421d..8df7a4b5 100644
--- a/src/fceu.cpp
+++ b/src/fceu.cpp
@@ -971,7 +971,7 @@ static int AutosaveCounter = 0;
 
 void UpdateAutosave(void)
 {
-	if(!EnableAutosave)
+	if(!EnableAutosave || turbo)
 		return;
 
 	char * f;