diff --git a/src/common/Version.hxx b/src/common/Version.hxx
index 0e51c5855..d1cc7be4a 100644
--- a/src/common/Version.hxx
+++ b/src/common/Version.hxx
@@ -22,7 +22,7 @@
 
 #include <cstdlib>
 
-#define STELLA_VERSION "3.5_svn_test2"
+#define STELLA_VERSION "3.5_svn_test3"
 #define STELLA_BUILD atoi("$Rev$" + 6)
 
 #endif
diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index b483159ad..655851bba 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -1649,6 +1649,11 @@ void EventHandler::saveKeyMapping()
 void EventHandler::saveJoyMapping()
 {
 #ifdef JOYSTICK_SUPPORT
+  // Don't update the joymap at all if it hasn't been modified during the
+  // program run
+  if(myNumJoysticks == 0)
+    return;
+
   // Save the joystick mapping hash table, making sure to update it with
   // any changes that have been made during the program run
   for(uInt32 i = 0; i < myNumJoysticks; ++i)