Index: museekd/main.cpp
===================================================================
--- museekd/main.cpp	(revision 866)
+++ museekd/main.cpp	(working copy)
@@ -104,6 +104,19 @@
   /* Load the configuration from %APPDIR%\Museekd\newnet.xml. */
   std::string configPath(getConfigPath("Museekd") + "\\newnet.xml");
 #endif // WIN32
+
+  for (int i = 1 ; i < argc ; i++) {
+    std::string arg(argv[i]);
+    if (arg == "--config" || arg == "-c") {
+      if (i + 1 != argc) {
+        configPath = argv[i+1];
+      } else {
+        NNLOG("museek.warn", "Missing config path, bailing out.");
+        return -1;
+      }
+    }
+  }
+
   if(! museekd->config()->load(configPath))
   {
     NNLOG("museek.warn", "Failed to load configuration, bailing out.");