diff --git a/plugins/tiddlywiki/multiwikiserver/modules/init.js b/plugins/tiddlywiki/multiwikiserver/modules/init.js
index 7e880bcf6..97092e80c 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/init.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/init.js
@@ -35,7 +35,7 @@ exports.startup = function() {
 		return;
 	}
 	// Compute the database path
-	var databasePath = path.resolve($tw.boot.wikiPath,"database.sqlite");
+	var databasePath = path.resolve($tw.boot.wikiPath,"store/database.sqlite");
 	// Create and initialise the tiddler store
 	var SqlTiddlerStore = require("$:/plugins/tiddlywiki/multiwikiserver/sql-tiddler-store.js").SqlTiddlerStore;
 	$tw.sqlTiddlerStore = new SqlTiddlerStore({
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/sql-tiddler-database.js b/plugins/tiddlywiki/multiwikiserver/modules/sql-tiddler-database.js
index 4c23e3aa9..e057c00ab 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/sql-tiddler-database.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/sql-tiddler-database.js
@@ -20,6 +20,9 @@ databasePath - path to the database file (can be ":memory:" to get a temporary d
 function SqlTiddlerDatabase(options) {
 	options = options || {};
 	// Create the database
+	if(options.databasePath) {
+		$tw.utils.createFileDirectories(options.databasePath);
+	}
 	var databasePath = options.databasePath || ":memory:";
 	this.db = new $tw.sqlite3.Database(databasePath,{verbose: undefined && console.log});
 }