diff --git a/changelog.txt b/changelog.txt
index ddaad7c7..b29f50fa 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,5 @@
 ---version 2.0.4 yet to be released---
+22-dec-2008 - shinydoofy - sdl - added Shift+M for toggling automatic movie backups for SDL
 22-dec-2008 - adelikat - Movie auto-backup feature implemented
 22-dec-2008 - adelikat - win32 - moved movie related menu items to a movie options dialog box
 22-dec-2008 - adelikat - Win32 - context menu item "create backup" for backing up movie files
diff --git a/src/drivers/sdl/config.cpp b/src/drivers/sdl/config.cpp
index e149c24f..c4631bdc 100644
--- a/src/drivers/sdl/config.cpp
+++ b/src/drivers/sdl/config.cpp
@@ -279,12 +279,12 @@ InitConfig()
     #endif
     config->addOption(prefix + "RenderBG", SDLK_F4);
     config->addOption(prefix + "SaveState", SDLK_F5);
-	config->addOption(prefix + "FrameAdvanceLagSkip", SDLK_F6);
+    config->addOption(prefix + "FrameAdvanceLagSkip", SDLK_F6);
     config->addOption(prefix + "LoadState", SDLK_F7);
-	config->addOption(prefix + "LagCounterDisplay", SDLK_F8);
+    config->addOption(prefix + "LagCounterDisplay", SDLK_F8);
     config->addOption(prefix + "MovieToggleFrameDisplay", SDLK_F9);
-	config->addOption(prefix + "SubtitleDisplay", SDLK_F10);
-	config->addOption(prefix + "Reset", SDLK_F11);
+    config->addOption(prefix + "SubtitleDisplay", SDLK_F10);
+    config->addOption(prefix + "Reset", SDLK_F11);
     config->addOption(prefix + "Screenshot", SDLK_F12);
     config->addOption(prefix + "Pause", SDLK_PAUSE);
     config->addOption(prefix + "DecreaseSpeed", SDLK_MINUS);
diff --git a/src/drivers/sdl/input.cpp b/src/drivers/sdl/input.cpp
index dff9a7de..83787483 100644
--- a/src/drivers/sdl/input.cpp
+++ b/src/drivers/sdl/input.cpp
@@ -331,6 +331,14 @@ KeyboardCommands()
     if(KEY(TAB)) {
         NoWaiting |= 1;
     }
+    
+    // Toggle Movie auto-backup
+    if(keyonly(M) && is_shift) {
+        autoMovieBackup ^= 1;
+        FCEUI_DispMessage("Automatic movie backup %sabled.",
+          autoMovieBackup ? "en" : "dis");
+    }
+    
 
     // Famicom disk-system games
     if(gametype==GIT_FDS) 
diff --git a/src/drivers/sdl/sdl.cpp b/src/drivers/sdl/sdl.cpp
index 0913b00b..374c18a8 100644
--- a/src/drivers/sdl/sdl.cpp
+++ b/src/drivers/sdl/sdl.cpp
@@ -573,8 +573,7 @@ SDL_GL_LoadLibrary(0);
     // movie playback
     std::string fname;
     g_config->getOption("SDL.Movie", &fname);
-	
-	g_config->setOption("SDL.Movie", "");
+    g_config->setOption("SDL.Movie", "");
     if (fname != "")
     {
         if(fname.find(".fm2") != std::string::npos)