Index: bin/mailjam-server
===================================================================
--- bin/mailjam-server	(revision 16)
+++ bin/mailjam-server	(revision 21)
@@ -1,9 +1,23 @@
 #!/usr/bin/env python
 #
-# Run the Postman XML-RPC server
+# Run the Mailjam XML-RPC server
+#
 
-from postman.daemon import PostmanDaemon
+import argparse
+
+from mailjam.daemon import MailjamDaemon
+
+msg = 'mailjam-server: Mailing lists management server'
+parser = argparse.ArgumentParser(description=msg)
+parser.add_argument('-c', '--config', action='store', dest='config',
+                    help='Set the path to a valid mailjam configuration file')
+parser.add_argument('-v', '--version', action='version',
+                    version='mailjam server 0.1.0')
 
 if __name__ == '__main__':
-    daemon = PostmanDaemon()
+    results = parser.parse_args()
+    if results.config:
+        daemon = MailjamDaemon(configfile=results.config)
+    else:
+        daemon = MailjamDaemon()
     daemon.run()