diff --git a/exec/dyndns.js b/exec/dyndns.js
index be46129e135c6fb09a96946359dcd7bf45fec160..7fa371425ce8d075c6f6c535dcab119af68739cc 100644
--- a/exec/dyndns.js
+++ b/exec/dyndns.js
@@ -4,13 +4,13 @@
 
 // $Id$
 
-// usage: ?dyndns <password>
+// usage: ?dyndns <password> [ip_address] [-mx address]
 
 const REVISION = "$Revision$".split(' ')[1];
 
 printf("Synchronet Dynamic DNS Client %s\r\n", REVISION);
 
-host_list=["vert.synchro.net", "rob.synchro.net", "bbs.synchro.net", "cvs.synchro.net"];
+host_list=["dyndns.synchro.net", "rob.synchro.net", "bbs.synchro.net", "cvs.synchro.net"];
 
 function writeln(str)
 {
@@ -18,6 +18,12 @@ function writeln(str)
 	print(str);
 }
 
+var mx_record;
+
+for(i=0;i<argc;i++)
+	if(argv[i].toLowerCase()=="-mx")
+		mx_record = argv[i+1];
+
 for(h in host_list) {
 	sock = new Socket();
 	if( (this.server != undefined) &&
@@ -47,6 +53,12 @@ for(h in host_list) {
 				else
 					writeln("");
 				break;
+			case "mx?":
+				if(mx_record)
+					writeln(mx_record);
+				else
+					writeln("");
+				break;
 			default:
 				writeln("");
 				break;