diff --git a/stella/src/common/Version.hxx b/stella/src/common/Version.hxx
index db846a590..ac665f1ba 100644
--- a/stella/src/common/Version.hxx
+++ b/stella/src/common/Version.hxx
@@ -13,12 +13,18 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: Version.hxx,v 1.13 2006-01-30 16:23:01 stephena Exp $
+// $Id: Version.hxx,v 1.14 2006-01-31 14:02:07 urchlay Exp $
 //============================================================================
 
 #ifndef VERSION_HXX
 #define VERSION_HXX
 
-#define STELLA_VERSION "2.1.1"
+#define STELLA_BASE_VERSION "2.1.1"
+
+#ifdef NIGHTLY_BUILD
+#define STELLA_VERSION STELLA_BASE_VERSION "pre-" NIGHTLY_BUILD
+#else
+#define STELLA_VERSION STELLA_BASE_VERSION
+#endif
 
 #endif
diff --git a/stella/src/emucore/OSystem.cxx b/stella/src/emucore/OSystem.cxx
index b164a0aac..cec5906d7 100644
--- a/stella/src/emucore/OSystem.cxx
+++ b/stella/src/emucore/OSystem.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: OSystem.cxx,v 1.59 2006-01-30 01:01:44 stephena Exp $
+// $Id: OSystem.cxx,v 1.60 2006-01-31 14:02:08 urchlay Exp $
 //============================================================================
 
 #include <cassert>
@@ -156,7 +156,13 @@ void OSystem::setPropertiesDir(const string& userpath,
 {
   // Set up the input and output properties files
   myUserPropertiesFile   = userpath + BSPF_PATH_SEPARATOR + "user.pro";
+#ifdef NIGHTLY_BUILD
+  // snapshots look in current dir
+  mySystemPropertiesFile = "stella.pro";
+#else
+  // releases look in system dir
   mySystemPropertiesFile = systempath + BSPF_PATH_SEPARATOR + "stella.pro";
+#endif
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -