diff --git a/BasiliskII/src/BeOS/xpram_beos.cpp b/BasiliskII/src/BeOS/xpram_beos.cpp
index 952ed638..8ee250a4 100644
--- a/BasiliskII/src/BeOS/xpram_beos.cpp
+++ b/BasiliskII/src/BeOS/xpram_beos.cpp
@@ -38,7 +38,7 @@ static BPath xpram_path;
  *  Load XPRAM from settings file
  */
 
-void LoadXPRAM(void)
+void LoadXPRAM(const char *vmdir)
 {
 	// Construct XPRAM path
 	find_directory(B_USER_SETTINGS_DIRECTORY, &xpram_path, true);
diff --git a/BasiliskII/src/MacOSX/main_macosx.mm b/BasiliskII/src/MacOSX/main_macosx.mm
index 0c058907..b83e4d07 100644
--- a/BasiliskII/src/MacOSX/main_macosx.mm
+++ b/BasiliskII/src/MacOSX/main_macosx.mm
@@ -286,6 +286,7 @@ int main(int argc, char **argv)
 
 bool InitEmulator (void)
 {
+	const char *vmdir = NULL;
 	char str[256];
 
 
@@ -423,7 +424,7 @@ bool InitEmulator (void)
 
 
 	// Initialize everything
-	if (!InitAll())
+	if (!InitAll(vmdir))
 		QuitEmulator();
 	D(bug("Initialization complete\n"));
 
diff --git a/BasiliskII/src/Unix/main_unix.cpp b/BasiliskII/src/Unix/main_unix.cpp
index 969bdaf5..22276387 100644
--- a/BasiliskII/src/Unix/main_unix.cpp
+++ b/BasiliskII/src/Unix/main_unix.cpp
@@ -374,13 +374,14 @@ static void usage(const char *prg_name)
 		"  --break ADDRESS\n    set ROM breakpoint\n"
 		"  --rominfo\n    dump ROM information\n", prg_name
 	);
-	LoadPrefs(); // read the prefs file so PrefsPrintUsage() will print the correct default values
+	LoadPrefs(NULL); // read the prefs file so PrefsPrintUsage() will print the correct default values
 	PrefsPrintUsage();
 	exit(0);
 }
 
 int main(int argc, char **argv)
 {
+	const char *vmdir = NULL;
 	char str[256];
 
 	// Initialize variables
@@ -466,7 +467,7 @@ int main(int argc, char **argv)
 #endif
 
 	// Read preferences
-	PrefsInit(argc, argv);
+	PrefsInit(vmdir, argc, argv);
 
 	// Any command line arguments left?
 	for (int i=1; i<argc; i++) {
@@ -674,7 +675,7 @@ int main(int argc, char **argv)
 #endif
 
 	// Initialize everything
-	if (!InitAll())
+	if (!InitAll(vmdir))
 		QuitEmulator();
 	D(bug("Initialization complete\n"));
 
diff --git a/BasiliskII/src/Unix/prefs_unix.cpp b/BasiliskII/src/Unix/prefs_unix.cpp
index 312e70a8..a92cd640 100644
--- a/BasiliskII/src/Unix/prefs_unix.cpp
+++ b/BasiliskII/src/Unix/prefs_unix.cpp
@@ -56,8 +56,20 @@ static string prefs_path;
  *  Load preferences from settings file
  */
 
-void LoadPrefs(void)
+void LoadPrefs(const char *vmdir)
 {
+	if (vmdir) {
+		prefs_path = string(vmdir) + '/' + string("prefs");
+		FILE *prefs = fopen(prefs_path.c_str(), "r");
+		if (!prefs) {
+			printf("No file at %s found.\n", prefs_path.c_str());
+			exit(1);
+		}
+		LoadPrefsFromStream(prefs);
+		fclose(prefs);
+		return;
+	}
+
 	// Construct prefs path
 	if (UserPrefsPath.empty()) {
 		char *home = getenv("HOME");
diff --git a/BasiliskII/src/Unix/xpram_unix.cpp b/BasiliskII/src/Unix/xpram_unix.cpp
index 2a889120..3037b02d 100644
--- a/BasiliskII/src/Unix/xpram_unix.cpp
+++ b/BasiliskII/src/Unix/xpram_unix.cpp
@@ -38,16 +38,24 @@ static char xpram_path[1024];
  *  Load XPRAM from settings file
  */
 
-void LoadXPRAM(void)
+void LoadXPRAM(const char *vmdir)
 {
-	// Construct XPRAM path
-	xpram_path[0] = 0;
-	char *home = getenv("HOME");
-	if (home != NULL && strlen(home) < 1000) {
-		strncpy(xpram_path, home, 1000);
-		strcat(xpram_path, "/");
+	if (vmdir) {
+#if POWERPC_ROM
+		snprintf(xpram_path, sizeof(xpram_path), "%s/nvram", vmdir);
+#else
+		snprintf(xpram_path, sizeof(xpram_path), "%s/xpram", vmdir);
+#endif
+	} else {
+		// Construct XPRAM path
+		xpram_path[0] = 0;
+		char *home = getenv("HOME");
+		if (home != NULL && strlen(home) < 1000) {
+			strncpy(xpram_path, home, 1000);
+			strcat(xpram_path, "/");
+		}
+		strcat(xpram_path, XPRAM_FILE_NAME);
 	}
-	strcat(xpram_path, XPRAM_FILE_NAME);
 
 	// Load XPRAM from settings file
 	int fd;
diff --git a/BasiliskII/src/Windows/main_windows.cpp b/BasiliskII/src/Windows/main_windows.cpp
index 245704e7..f99c5cfc 100755
--- a/BasiliskII/src/Windows/main_windows.cpp
+++ b/BasiliskII/src/Windows/main_windows.cpp
@@ -206,7 +206,7 @@ static void usage(const char *prg_name)
 		"  --break ADDRESS\n    set ROM breakpoint\n"
 		"  --rominfo\n    dump ROM information\n", prg_name
 	);
-	LoadPrefs(); // read the prefs file so PrefsPrintUsage() will print the correct default values
+	LoadPrefs(NULL); // read the prefs file so PrefsPrintUsage() will print the correct default values
 	PrefsPrintUsage();
 	exit(0);
 }
diff --git a/BasiliskII/src/Windows/prefs_editor_gtk.cpp b/BasiliskII/src/Windows/prefs_editor_gtk.cpp
index f9705b65..a659c4e0 100644
--- a/BasiliskII/src/Windows/prefs_editor_gtk.cpp
+++ b/BasiliskII/src/Windows/prefs_editor_gtk.cpp
@@ -1731,7 +1731,7 @@ int main(int argc, char *argv[])
 	gtk_init(&argc, &argv);
 
 	// Read preferences
-	PrefsInit(argc, argv);
+	PrefsInit(NULL, argc, argv);
 
 	// Migrate preferences
 	PrefsMigrate();
diff --git a/BasiliskII/src/Windows/prefs_windows.cpp b/BasiliskII/src/Windows/prefs_windows.cpp
index 7122d41a..ef3eac10 100755
--- a/BasiliskII/src/Windows/prefs_windows.cpp
+++ b/BasiliskII/src/Windows/prefs_windows.cpp
@@ -70,7 +70,7 @@ static string prefs_path;
  *  Load preferences from settings file
  */
 
-void LoadPrefs(void)
+void LoadPrefs(const char *vmdir)
 {
 	// Construct prefs path
 	if (UserPrefsPath.empty()) {
diff --git a/BasiliskII/src/Windows/xpram_windows.cpp b/BasiliskII/src/Windows/xpram_windows.cpp
index 6039504c..f69c0d0e 100755
--- a/BasiliskII/src/Windows/xpram_windows.cpp
+++ b/BasiliskII/src/Windows/xpram_windows.cpp
@@ -58,7 +58,7 @@ static void build_xpram_path(void)
  *  Load XPRAM from settings file
  */
 
-void LoadXPRAM(void)
+void LoadXPRAM(const char *vmdir)
 {
 	// Construct XPRAM path
 	build_xpram_path();
diff --git a/BasiliskII/src/include/main.h b/BasiliskII/src/include/main.h
index cc67b1ce..d886eb29 100644
--- a/BasiliskII/src/include/main.h
+++ b/BasiliskII/src/include/main.h
@@ -39,7 +39,7 @@ struct M68kRegisters {
 };
 
 // General functions
-extern bool InitAll(void);
+extern bool InitAll(const char *vmdir);
 extern void ExitAll(void);
 
 // Platform-specific functions
diff --git a/BasiliskII/src/include/prefs.h b/BasiliskII/src/include/prefs.h
index 74e05bc6..216137f2 100644
--- a/BasiliskII/src/include/prefs.h
+++ b/BasiliskII/src/include/prefs.h
@@ -23,7 +23,7 @@
 
 #include <stdio.h>
 
-extern void PrefsInit(int &argc, char **&argv);
+extern void PrefsInit(const char *vmdir, int &argc, char **&argv);
 extern void PrefsExit(void);
 
 extern void PrefsPrintUsage(void);
@@ -32,7 +32,7 @@ extern void AddPrefsDefaults(void);
 extern void AddPlatformPrefsDefaults(void);
 
 // Preferences loading/saving
-extern void LoadPrefs(void);
+extern void LoadPrefs(const char *vmdir);
 extern void SavePrefs(void);
 
 extern void LoadPrefsFromStream(FILE *f);
diff --git a/BasiliskII/src/include/xpram.h b/BasiliskII/src/include/xpram.h
index 60f26897..89e96b13 100644
--- a/BasiliskII/src/include/xpram.h
+++ b/BasiliskII/src/include/xpram.h
@@ -29,11 +29,11 @@ const int XPRAM_SIZE = 256;
 
 extern uint8 XPRAM[XPRAM_SIZE];
 
-extern void XPRAMInit(void);
+extern void XPRAMInit(const char *vmdir);
 extern void XPRAMExit(void);
 
 // System specific and internal functions/data
-extern void LoadXPRAM(void);
+extern void LoadXPRAM(const char *vmdir);
 extern void SaveXPRAM(void);
 extern void ZapPRAM(void);
 
diff --git a/BasiliskII/src/main.cpp b/BasiliskII/src/main.cpp
index c45c8dad..9455d387 100644
--- a/BasiliskII/src/main.cpp
+++ b/BasiliskII/src/main.cpp
@@ -61,7 +61,7 @@ static void mon_write_byte_b2(uintptr adr, uint32 b)
  *  Initialize everything, returns false on error
  */
 
-bool InitAll(void)
+bool InitAll(const char *vmdir)
 {
 	// Check ROM version
 	if (!CheckROM()) {
@@ -100,7 +100,7 @@ bool InitAll(void)
 #endif
 
 	// Load XPRAM
-	XPRAMInit();
+	XPRAMInit(vmdir);
 
 	// Load XPRAM default values if signature not found
 	if (XPRAM[0x0c] != 0x4e || XPRAM[0x0d] != 0x75
diff --git a/BasiliskII/src/prefs.cpp b/BasiliskII/src/prefs.cpp
index 29204e60..2a551547 100644
--- a/BasiliskII/src/prefs.cpp
+++ b/BasiliskII/src/prefs.cpp
@@ -47,21 +47,21 @@ static const prefs_desc *find_prefs_desc(const char *name);
  *  Initialize preferences
  */
 
-void PrefsInit(int &argc, char **&argv)
+void PrefsInit(const char *vmdir, int &argc, char **&argv)
 {
 	// Set defaults
 	AddPrefsDefaults();
 	AddPlatformPrefsDefaults();
 
 	// Load preferences from settings file
-	LoadPrefs();
+	LoadPrefs(vmdir);
 
 	// Override prefs with command line options
 	for (int i=1; i<argc; i++) {
 
 		// Options are of the form '--keyword'
 		const char *option = argv[i];
-		if (strlen(option) < 3 || option[0] != '-' || option[1] != '-')
+		if (!option || strlen(option) < 3 || option[0] != '-' || option[1] != '-')
 			continue;
 		const char *keyword = option + 2;
 
diff --git a/BasiliskII/src/xpram.cpp b/BasiliskII/src/xpram.cpp
index 7c5627d7..9b9ff0a0 100644
--- a/BasiliskII/src/xpram.cpp
+++ b/BasiliskII/src/xpram.cpp
@@ -37,13 +37,13 @@ uint8 XPRAM[XPRAM_SIZE];
  *  Initialize XPRAM
  */
 
-void XPRAMInit(void)
+void XPRAMInit(const char *vmdir)
 {
 	// Clear XPRAM
 	memset(XPRAM, 0, XPRAM_SIZE);
 
 	// Load XPRAM from settings file
-	LoadXPRAM();
+	LoadXPRAM(vmdir);
 }