diff --git a/rabbithole/core/boot.js b/rabbithole/core/boot.js
index e821534ba..c04b5a261 100644
--- a/rabbithole/core/boot.js
+++ b/rabbithole/core/boot.js
@@ -51,7 +51,8 @@ $tw.config = $tw.config || {};
 
 // Constants
 $tw.config.root = $tw.config.root || "$:"; // Root for module titles (eg, "$:/kernel/boot.js")
-$tw.config.moduleSubDir = $tw.config.moduleSubDir || "./modules";
+$tw.config.bootModuleSubDir = $tw.config.bootModuleSubDir || "./modules";
+$tw.config.wikiPluginsSubDir = $tw.config.wikiPluginsSubDir || "./plugins";
 
 // File extensions
 $tw.config.fileExtensions = {
@@ -549,17 +550,19 @@ Load all the plugins from the plugins directory
 $tw.plugins.loadPlugins = function(filepath,basetitle,excludeRegExp) {
 	basetitle = basetitle || "$:/plugins";
 	excludeRegExp = excludeRegExp || /^\.DS_Store$|.meta$/;
-	var stat = fs.statSync(filepath);
-	if(stat.isDirectory()) {
-		var files = fs.readdirSync(filepath);
-		for(var f=0; f<files.length; f++) {
-			var file = files[f];
-			if(!excludeRegExp.test(file)) {
-				$tw.plugins.loadPlugins(filepath + "/" + file,basetitle + "/" + file,excludeRegExp);
+	if(path.existsSync(filepath)) {
+		var stat = fs.statSync(filepath);
+		if(stat.isDirectory()) {
+			var files = fs.readdirSync(filepath);
+			for(var f=0; f<files.length; f++) {
+				var file = files[f];
+				if(!excludeRegExp.test(file)) {
+					$tw.plugins.loadPlugins(filepath + "/" + file,basetitle + "/" + file,excludeRegExp);
+				}
 			}
+		} else if(stat.isFile()) {
+			$tw.plugins.loadTiddlersFromFile(filepath,basetitle);
 		}
-	} else if(stat.isFile()) {
-		$tw.plugins.loadTiddlersFromFile(filepath,basetitle);
 	}
 }
 
@@ -599,7 +602,10 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
 }
 
 // Load plugins from the plugins directory
-$tw.plugins.loadPlugins(path.resolve($tw.boot.bootPath,$tw.config.moduleSubDir));
+$tw.plugins.loadPlugins(path.resolve($tw.boot.bootPath,$tw.config.bootModuleSubDir));
+
+// Load any plugins in the wiki plugins directory
+$tw.plugins.loadPlugins(require("path").resolve($tw.boot.wikiPath,$tw.config.wikiPluginsSubDir));
 
 // End of if(!$tw.isBrowser)	
 }
diff --git a/rabbithole/core/modules/startup.js b/rabbithole/core/modules/startup.js
index de52ce803..e7b108583 100644
--- a/rabbithole/core/modules/startup.js
+++ b/rabbithole/core/modules/startup.js
@@ -13,7 +13,6 @@ This is the main application logic for both the client and server
 
 exports.startup = function() {
 	var modules,n,m,f;
-
 	// Set up additional global objects
 	$tw.plugins.applyMethods("global",$tw);
 	// Wire up plugin modules
diff --git a/rabbithole/tw5.com/plugins/demoplugin/demoplugin.js b/rabbithole/tw5.com/plugins/demoplugin/demoplugin.js
new file mode 100644
index 000000000..386695799
--- /dev/null
+++ b/rabbithole/tw5.com/plugins/demoplugin/demoplugin.js
@@ -0,0 +1,15 @@
+/*\
+title: $:/tiddlywiki/plugins/demoplugin/demoplugin.js
+type: application/javascript
+module-type: demo
+
+A demo plugin
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+"use strict";
+
+
+})();
diff --git a/rabbithole/tw5.com/tw5.com.recipe b/rabbithole/tw5.com/tw5.com.recipe
index 0d4993d46..62e00602c 100644
--- a/rabbithole/tw5.com/tw5.com.recipe
+++ b/rabbithole/tw5.com/tw5.com.recipe
@@ -8,3 +8,6 @@ shadow: shadows/templates/*.tid
 shadow: shadows/tiddlycss/*.tid
 #jslib: lib/jquery.js
 #jslib: lib/bootstrap/js/bootstrap.js
+
+pluginmodule: plugins/*.js
+pluginmodule: plugins/demoplugin/*.js