diff --git a/WINGs/ChangeLog b/WINGs/ChangeLog
index d6ef10c8..a08f7f51 100644
--- a/WINGs/ChangeLog
+++ b/WINGs/ChangeLog
@@ -8,7 +8,8 @@ changes since wmaker 0.63.1:
   Also updated get-{wings|wutil}-flags.
 - Fixed a mem leak in WMList.
 - Fixed a bug that caused sigsegv for a WMList with more than 32767 items.
-
+- Added an example of how to create a server type program with WMConnection.
+ 
 
 changes since wmaker 0.62.1:
 ............................
diff --git a/WINGs/Examples/.cvsignore b/WINGs/Examples/.cvsignore
index 6953780c..6358b0e3 100644
--- a/WINGs/Examples/.cvsignore
+++ b/WINGs/Examples/.cvsignore
@@ -1,5 +1,5 @@
 Makefile Makefile.in
-connect fontl puzzle
+connect server fontl puzzle UserTime.plist
 .libs
 .psrc .inslog2 tca.map tca.log
 *.rpt
diff --git a/WINGs/Examples/Makefile.am b/WINGs/Examples/Makefile.am
index 3bd064f8..c19de96b 100644
--- a/WINGs/Examples/Makefile.am
+++ b/WINGs/Examples/Makefile.am
@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = no-dependencies
 
 
-noinst_PROGRAMS = connect fontl puzzle
+noinst_PROGRAMS = connect server fontl puzzle
 
 
 LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
@@ -19,6 +19,11 @@ connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
 connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
 	@NETLIBS@ @LIBPL@
 
+server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
+
+server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
+	@NETLIBS@ @LIBPL@
+
 
 INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
diff --git a/WINGs/Examples/README b/WINGs/Examples/README
new file mode 100644
index 00000000..ab8aa3fe
--- /dev/null
+++ b/WINGs/Examples/README
@@ -0,0 +1,19 @@
+
+
+Files:
+-----
+
+server		- server example of using WMConnection. It keeps a database of
+		  timeouts for a group of users, allowing one to add/remove
+		  users and update the timeouts associated with them.
+
+connect		- client example of using WMConnection. Works with the server
+		  program above. Just start both without any parameter and
+		  type help in the client to find out how to operate them.
+		  Rest is self explanatory.
+
+puzzle		- a nice zuPzel =)
+
+fontl		- a map of all characters with their corresponding ascii,
+		  hex, decimal and octal representations.
+
diff --git a/WINGs/Examples/connect.c b/WINGs/Examples/connect.c
index 9317273a..6a0063e1 100644
--- a/WINGs/Examples/connect.c
+++ b/WINGs/Examples/connect.c
@@ -1,21 +1,8 @@
 /*
  *  WINGs connect.c: example how to create a network client using WMConnection
  * 
- *  Copyright (c) 1999 Dan Pascu
+ *  Copyright (c) 1999-2001 Dan Pascu
  * 
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 
@@ -168,7 +155,7 @@ main(int argc, char **argv) /*FOLD00*/
         ProgName++;
 
     host = NULL;
-    port = "7000";
+    port = "34567";
 
     if (argc>1) {
         for (i=1; i<argc; i++) {
diff --git a/WINGs/Examples/server.c b/WINGs/Examples/server.c
new file mode 100644
index 00000000..5fde492e
--- /dev/null
+++ b/WINGs/Examples/server.c
@@ -0,0 +1,728 @@
+/*
+ *  WINGs server.c: example how to create a network server using WMConnection
+ *
+ *  Copyright (c) 2001 Dan Pascu
+ *
+ */
+
+
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <WINGs/WINGs.h>
+
+
+#define _(P)         P
+#define MAXCMD_SIZE  512
+
+
+char *SEConnectionShouldBeRemovedNotification = "SEConnectionShouldBeRemovedNotification";
+
+
+
+
+static void didReceiveInput(ConnectionDelegate *self, WMConnection *cPtr);
+
+static void connectionDidDie(ConnectionDelegate *self, WMConnection *cPtr);
+
+static void connectionDidTimeout(ConnectionDelegate *self, WMConnection *cPtr);
+
+
+extern char *SEConnectionShouldBeRemovedNotification;
+
+static WMUserDefaults *timeDB = NULL;
+static char *ServerAddress = NULL;
+static char *ServerPort = NULL;
+static WMArray *allowedHostList = NULL;
+static WMArray *clientConnections = NULL;
+static WMConnection *serverPtr = NULL;
+
+
+
+static ConnectionDelegate socketDelegate = {
+    NULL,                 /* client data */
+    NULL,                 /* didCatchException */
+    connectionDidDie,     /* didDie */
+    NULL,                 /* didInitialize */
+    didReceiveInput,      /* didReceiveInput */
+    connectionDidTimeout  /* didTimeout */
+};
+
+
+
+void
+wAbort(Bool foo) /*FOLD00*/
+{
+    exit(1);
+}
+
+
+static void
+printHelp(char *progname) /*FOLD00*/
+{
+    printf(_("usage: %s [options]\n\n"), progname);
+    puts(_(" --help				print this message"));
+    puts(_(" --listen [address:]port	only listen on the specified address/port"));
+    puts(_(" --allow host1[,host2...]	only allow connections from listed hosts\n"));
+    puts(_(" By default server listens on all interfaces and port 34567, unless"
+           " something\nelse is specified with the --listen option. If address is"
+           " omitted or the keyword\n'Any' is used, it will listen on all interfaces else"
+           " only on the specified one.\n\nFor example --listen localhost: will"
+           " listen on the default port 34567, but only\non connections comming"
+           " in through the loopback interface.\n\n Also by default the server"
+           " listens to incoming connections from any host,\nunless a list of"
+           " hosts is given with the --allow option, in which case it will\nreject"
+           " connections not comming from those hosts.\nThe list of hosts is comma"
+           " separated and should NOT contain ANY spaces."));
+}
+
+
+static void
+enqueueConnectionForRemoval(WMConnection *cPtr)
+{
+    WMNotification *notif;
+
+    /*don't release notif here. it will be released by queue after processing */
+    notif = WMCreateNotification(SEConnectionShouldBeRemovedNotification,
+                                 cPtr, NULL);
+    WMEnqueueNotification(WMGetDefaultNotificationQueue(), notif, WMPostASAP);
+}
+
+
+static int
+sendMessage(WMConnection *cPtr, char *message)
+{
+    WMData *aData;
+    int res;
+
+    if (WMGetConnectionState(cPtr)!=WCConnected)
+        return -1;
+
+    aData = WMCreateDataWithBytes(message, strlen(message));
+    res = WMSendConnectionData(cPtr, aData);
+    WMReleaseData(aData);
+
+    return res;
+}
+
+
+static Bool
+enqueueMessage(WMConnection *cPtr, char *message)
+{
+    WMData *aData;
+    Bool res;
+
+    if (WMGetConnectionState(cPtr)!=WCConnected)
+        return False;
+
+    aData = WMCreateDataWithBytes(message, strlen(message));
+    res = WMEnqueueConnectionData(cPtr, aData);
+    WMReleaseData(aData);
+
+    return res;
+}
+
+
+static unsigned char*
+findDelimiter(unsigned char *data, unsigned const char *endPtr)
+{
+    wassertrv(data < endPtr, NULL);
+
+    while (data<endPtr && *data!='\n' && *data!='\r' && *data!=';' && *data!='\0')
+        data++;
+
+    if (data < endPtr)
+        return data;
+
+    return NULL;
+}
+
+
+static WMArray*
+getAvailableMessages(WMConnection *cPtr)
+{
+    char *ptr, *crtPos, *buffer;
+    const char *bytes, *endPtr;
+    WMData *aData, *receivedData, *holdData;
+    WMRange range;
+    WMArray *messages;
+    int length;
+
+    receivedData = WMGetConnectionAvailableData(cPtr);
+    if (!receivedData)
+        return NULL;
+    if ((length=WMGetDataLength(receivedData))==0) {
+        WMReleaseData(receivedData);
+        return NULL;
+    }
+
+    holdData = (WMData*)WMGetConnectionClientData(cPtr);
+    if (holdData) {
+        WMAppendData(holdData, receivedData);
+        WMReleaseData(receivedData);
+        WMSetConnectionClientData(cPtr, NULL);
+        aData = holdData;
+    } else {
+        aData = receivedData;
+    }
+
+    length = WMGetDataLength(aData);
+    bytes = (char*)WMDataBytes(aData);
+    endPtr = bytes + length;
+
+    messages = WMCreateArrayWithDestructor(1, wfree);
+    crtPos = (char*)bytes;
+    while (crtPos<endPtr && (ptr = findDelimiter(crtPos, endPtr))!=NULL) {
+        range.position = (crtPos - bytes);
+        range.count = (ptr - crtPos);
+        if (range.count > MAXCMD_SIZE) {
+            /* Hmmm... The message is too long. Possibly that someone is
+             * flooding us, or there is a dumb client which do not know
+             * who is talking to. */
+            sendMessage(cPtr, "Command too long\n\r");
+            WMFreeArray(messages);
+            WMReleaseData(aData);
+            WMCloseConnection(cPtr);
+            enqueueConnectionForRemoval(cPtr);
+            return NULL;
+        }
+        buffer = wmalloc(range.count+1);
+        WMGetDataBytesWithRange(aData, buffer, range);
+        buffer[range.count] = '\0';
+        WMAddToArray(messages, buffer);
+        crtPos = ptr;
+        while (crtPos<endPtr && (*crtPos=='\n' || *crtPos=='\r' ||
+                                 *crtPos=='\t' || *crtPos=='\0' ||
+                                 *crtPos==';' || *crtPos==' ')) {
+            crtPos++;
+        }
+    }
+
+    if (crtPos<endPtr) {
+        range.position = (crtPos - bytes);
+        range.count = (endPtr - crtPos);
+        if (range.count > MAXCMD_SIZE) {
+            /* Flooooooding!!!! */
+            sendMessage(cPtr, "Message too long\n\r");
+            WMFreeArray(messages);
+            WMReleaseData(aData);
+            WMCloseConnection(cPtr);
+            enqueueConnectionForRemoval(cPtr);
+            return NULL;
+        }
+        holdData = WMGetSubdataWithRange(aData, range);
+        WMSetConnectionClientData(cPtr, holdData);
+    }
+    WMReleaseData(aData);
+
+    if (WMGetArrayItemCount(messages)==0) {
+        WMFreeArray(messages);
+        messages = NULL;
+    }
+    return messages;
+}
+
+
+
+static void
+complainAboutBadArgs(WMConnection *cPtr, char *cmdName, char *badArgs) /*FOLD00*/
+{
+    char *buf = wmalloc(strlen(cmdName) + strlen(badArgs) + 100);
+
+    sprintf(buf, _("Invalid parameters '%s' for command %s. Use HELP for"
+                   " a list of commands.\n"), badArgs, cmdName);
+    sendMessage(cPtr, buf);
+    wfree(buf);
+}
+
+
+static void
+sendUpdateMessage(WMConnection *cPtr, char *id, int time) /*FOLD00*/
+{
+    char *buf = wmalloc(strlen(id) + 100);
+
+    sprintf(buf, "%s has %i minutes left\n", id, time);
+    sendMessage(cPtr, buf);
+    wfree(buf);
+}
+
+
+static void
+showId(WMConnection *cPtr)
+{
+    sendMessage(cPtr, "Server example based on WMConnection\n");
+}
+
+
+static void
+showHelp(WMConnection *cPtr) /*FOLD00*/
+{
+    char *buf = wmalloc(strlen(WMGetApplicationName()) + 16);
+
+    sprintf(buf, _("%s commands:\n\n"), WMGetApplicationName());
+
+    enqueueMessage(cPtr, _("\n"));
+    enqueueMessage(cPtr, buf);
+    enqueueMessage(cPtr, _("GET <id>\t- return time left (in minutes) "
+                           "for user with id <id>\n"));
+    enqueueMessage(cPtr, _("SET <id> <time>\t- set time limit to <time> "
+                           "minutes for user with id <id>\n"));
+    enqueueMessage(cPtr, _("ADD <id> <time>\t- add <time> minutes "
+                           "for user with id <id>\n"));
+    enqueueMessage(cPtr, _("SUB <id> <time>\t- subtract <time> minutes "
+                           "for user with id <id>\n"));
+    enqueueMessage(cPtr, _("REMOVE <id>\t- remove time limitations for "
+                           "user with id <id>\n"));
+    enqueueMessage(cPtr, _("LIST\t\t- list all users and their "
+                           "corresponding time limit\n"));
+    enqueueMessage(cPtr, _("ID\t\t- returns the Time Manager "
+                           "identification string\n"));
+    enqueueMessage(cPtr, _("EXIT\t\t- exits session\n"));
+    enqueueMessage(cPtr, _("QUIT\t\t- exits session\n"));
+    enqueueMessage(cPtr, _("HELP\t\t- show this message\n\n"));
+    /* Just flush the queue we made before */
+    WMFlushConnection(cPtr);
+    wfree(buf);
+}
+
+
+static void
+listUsers(WMConnection *cPtr)
+{
+    proplist_t userList;
+    char *id;
+    int i, time;
+
+    userList = WMGetUDAllKeys(timeDB);
+
+    for (i=0; i<PLGetNumberOfElements(userList); i++) {
+        id = PLGetString(PLGetArrayElement(userList, i));
+        time = WMGetUDIntegerForKey(timeDB, id);
+        sendUpdateMessage(cPtr, id, time);
+    }
+
+    PLRelease(userList);
+}
+
+
+static void
+setTimeForUser(WMConnection *cPtr, char *cmdArgs) /*FOLD00*/
+{
+    char *id;
+    int i, time;
+
+    id = wmalloc(strlen(cmdArgs));
+    if (sscanf(cmdArgs, "%s %d", id, &time)!=2) {
+        complainAboutBadArgs(cPtr, "SET", cmdArgs);
+        wfree(id);
+        return;
+    }
+    if (time<0)
+        time = 0;
+
+    WMSetUDIntegerForKey(timeDB, time, id);
+
+    for (i=0; i<WMGetArrayItemCount(clientConnections); i++) {
+        cPtr = WMGetFromArray(clientConnections, i);
+        sendUpdateMessage(cPtr, id, time);
+    }
+    wfree(id);
+}
+
+
+static void
+addTimeToUser(WMConnection *cPtr, char *cmdArgs) /*FOLD00*/
+{
+    char *id;
+    int i, time, newTime;
+
+    id = wmalloc(strlen(cmdArgs));
+    if (sscanf(cmdArgs, "%s %d", id, &time)!=2) {
+        complainAboutBadArgs(cPtr, "ADD", cmdArgs);
+        wfree(id);
+        return;
+    }
+
+    newTime = WMGetUDIntegerForKey(timeDB, id) + time;
+    if (newTime<0)
+        newTime = 0;
+
+    WMSetUDIntegerForKey(timeDB, newTime, id);
+
+    for (i=0; i<WMGetArrayItemCount(clientConnections); i++) {
+        cPtr = WMGetFromArray(clientConnections, i);
+        sendUpdateMessage(cPtr, id, newTime);
+    }
+    wfree(id);
+}
+
+
+static void
+subTimeFromUser(WMConnection *cPtr, char *cmdArgs) /*FOLD00*/
+{
+    char *id;
+    int i, time, newTime;
+
+    id = wmalloc(strlen(cmdArgs));
+    if (sscanf(cmdArgs, "%s %d", id, &time)!=2) {
+        complainAboutBadArgs(cPtr, "SUB", cmdArgs);
+        wfree(id);
+        return;
+    }
+
+    newTime = WMGetUDIntegerForKey(timeDB, id) - time;
+    if (newTime<0)
+        newTime = 0;
+
+    WMSetUDIntegerForKey(timeDB, newTime, id);
+
+    for (i=0; i<WMGetArrayItemCount(clientConnections); i++) {
+        cPtr = WMGetFromArray(clientConnections, i);
+        sendUpdateMessage(cPtr, id, newTime);
+    }
+    wfree(id);
+}
+
+
+static void
+removeTimeForUser(WMConnection *cPtr, char *cmdArgs) /*FOLD00*/
+{
+    char *ptr;
+    int i;
+
+    if (cmdArgs[0]=='\0') {
+        sendMessage(cPtr, _("Missing parameter for command REMOVE."
+                            " Use HELP for a list of commands.\n"));
+        return;
+    }
+
+    ptr = cmdArgs;
+    while (*ptr && *ptr!=' ' && *ptr!='\t')
+        ptr++;
+    *ptr = '\0';
+
+    WMRemoveUDObjectForKey(timeDB, cmdArgs);
+
+    for (i=0; i<WMGetArrayItemCount(clientConnections); i++) {
+        cPtr = WMGetFromArray(clientConnections, i);
+        sendUpdateMessage(cPtr, cmdArgs, -1);
+    }
+}
+
+
+static void
+getTimeForUser(WMConnection *cPtr, char *cmdArgs) /*FOLD00*/
+{
+    char *ptr;
+    int time;
+
+    if (cmdArgs[0]=='\0') {
+        sendMessage(cPtr, _("Missing parameter for command GET."
+                            " Use HELP for a list of commands.\n"));
+        return;
+    }
+
+    ptr = cmdArgs;
+    while (*ptr && *ptr!=' ' && *ptr!='\t')
+        ptr++;
+    *ptr = '\0';
+
+    if (WMGetUDObjectForKey(timeDB, cmdArgs)!=NULL)
+        time = WMGetUDIntegerForKey(timeDB, cmdArgs);
+    else
+        time = -1;
+
+    sendUpdateMessage(cPtr, cmdArgs, time);
+}
+
+
+static void
+handleConnection(WMConnection *cPtr)
+{
+    char *command, *ptr, *cmdArgs, *buffer;
+    WMArray *commands;
+    int i;
+
+    commands = getAvailableMessages(cPtr);
+    if (!commands)
+        return;
+
+    for (i=0; i<WMGetArrayItemCount(commands); i++) {
+        command = WMGetFromArray(commands, i);
+        while (*command && (*command==' ' || *command=='\t'))
+            command++;
+        ptr = command;
+        while(*ptr && *ptr!=' ' && *ptr!='\t')
+            ptr++;
+        if (*ptr) {
+            *ptr = '\0';
+            ptr++;
+        }
+        while (*ptr && (*ptr==' ' || *ptr=='\t'))
+            ptr++;
+
+        cmdArgs = ptr;
+
+        fprintf(stderr, "Command: '%s', args: '%s'\n", command, cmdArgs);
+
+        if (strcasecmp(command, "quit")==0 || strcasecmp(command, "exit")==0) {
+            sendMessage(cPtr, "Bye\n");
+            WMCloseConnection(cPtr);
+            enqueueConnectionForRemoval(cPtr);
+            WMFreeArray(commands);
+            return;
+        } else if (strcasecmp(command, "id")==0) {
+            showId(cPtr);
+        } else if (strcasecmp(command, "help")==0) {
+            showHelp(cPtr);
+        } else if (strcasecmp(command, "list")==0) {
+            listUsers(cPtr);
+        } else if (strcasecmp(command, "set")==0) {
+            setTimeForUser(cPtr, cmdArgs);
+        } else if (strcasecmp(command, "add")==0) {
+            addTimeToUser(cPtr, cmdArgs);
+        } else if (strcasecmp(command, "sub")==0) {
+            subTimeFromUser(cPtr, cmdArgs);
+        } else if (strcasecmp(command, "remove")==0) {
+            removeTimeForUser(cPtr, cmdArgs);
+        } else if (strcasecmp(command, "get")==0) {
+            getTimeForUser(cPtr, cmdArgs);
+        } else {
+            buffer = wmalloc(strlen(command) + 100);
+            sprintf(buffer, _("Unknown command '%s'. Try HELP for"
+                              " a list of commands.\n"), command);
+            sendMessage(cPtr, buffer);
+            wfree(buffer);
+        }
+    }
+
+    WMFreeArray(commands);
+}
+
+
+static Bool
+isAllowedToConnect(WMConnection *cPtr)
+{
+    WMHost *hPtr;
+    int i;
+
+    if (allowedHostList == NULL)
+        return True; /* No list. Allow all by default */
+
+    hPtr = WMGetHostWithAddress(WMGetConnectionAddress(cPtr));
+    for (i=0; i<WMGetArrayItemCount(allowedHostList); i++) {
+        if (WMIsHostEqualToHost(hPtr, WMGetFromArray(allowedHostList, i))) {
+            WMReleaseHost(hPtr);
+            return True;
+        }
+    }
+
+    WMReleaseHost(hPtr);
+
+    return False;
+}
+
+
+static void
+didReceiveInput(ConnectionDelegate *self, WMConnection *cPtr) /*FOLD00*/
+{
+    if (cPtr == serverPtr) {
+        WMConnection *newPtr = WMAcceptConnection(cPtr);
+
+        if (newPtr) {
+            if (isAllowedToConnect(newPtr)) {
+                WMSetConnectionDelegate(newPtr, &socketDelegate);
+                WMSetConnectionSendTimeout(newPtr, 120);
+                WMAddToArray(clientConnections, newPtr);
+            } else {
+                sendMessage(newPtr, "Sorry, you are not allowed to connect.\n");
+                WMDestroyConnection(newPtr);
+            }
+        }
+    } else {
+        /* Data arriving on an already-connected socket */
+        handleConnection(cPtr);
+    }
+}
+
+
+static void
+connectionDidTimeout(ConnectionDelegate *self, WMConnection *cPtr) /*FOLD00*/
+{
+    WMHost *hPtr;
+
+    if (cPtr == serverPtr) {
+        wfatal(_("The server listening socket did timeout. Exiting."));
+        exit(1);
+    }
+
+    hPtr = WMGetHostWithAddress(WMGetConnectionAddress(cPtr));
+    wwarning(_("Connection with %s did timeout. Closing connection."),
+             WMGetHostName(hPtr));
+    WMReleaseHost(hPtr);
+
+    enqueueConnectionForRemoval(cPtr);
+}
+
+
+static void
+connectionDidDie(ConnectionDelegate *self, WMConnection *cPtr)
+{
+    if (cPtr == serverPtr) {
+        /* trouble. server listening port itself died!!! */
+        wfatal(_("The server listening socket died. Exiting."));
+        exit(1);
+    }
+
+    enqueueConnectionForRemoval(cPtr);
+}
+
+
+static void
+removeConnection(void *observer, WMNotification *notification)
+{
+    WMConnection *cPtr = (WMConnection*)WMGetNotificationObject(notification);
+    WMData *data;
+
+    WMRemoveFromArray(clientConnections, cPtr);
+    if ((data = (WMData*)WMGetConnectionClientData(cPtr))!=NULL)
+        WMReleaseData(data);
+    WMDestroyConnection(cPtr);
+}
+
+
+static Bool
+isDifferent(char *str1, char *str2) /*FOLD00*/
+{
+    if ((!str1 && !str2) || (str1 && str2 && strcmp(str1, str2)==0))
+        return False;
+
+    return True;
+}
+
+
+int
+main(int argc, char **argv) /*FOLD00*/
+{
+    int i;
+
+    wsetabort(wAbort);
+
+    WMInitializeApplication("server", &argc, argv);
+
+    if (argc>1) {
+        for (i=1; i<argc; i++) {
+            if (strcmp(argv[i], "--help")==0) {
+                printHelp(argv[0]);
+                exit(0);
+            } else if (strcmp(argv[i], "--listen")==0) {
+                char *p;
+
+                if ((p = strchr(argv[++i], ':')) != NULL) {
+                    *p = 0;
+                    ServerAddress = wstrdup(argv[i]);
+                    ServerPort = wstrdup(p+1);
+                    *p = ':';
+                    if (ServerAddress[0] == 0) {
+                        wfree(ServerAddress);
+                        ServerAddress = NULL;
+                    }
+                    if (ServerPort[0] == 0) {
+                        wfree(ServerPort);
+                        ServerPort = "34567";
+                    }
+                } else if (argv[i][0]!=0) {
+                    ServerPort = argv[i];
+                }
+            } else if (strcmp(argv[i], "--allow")==0) {
+                char *p, *ptr;
+                int done;
+                WMHost *hPtr;
+
+                ptr = argv[++i];
+                done = 0;
+                while (!done) {
+                    if ((p = strchr(ptr, ',')) != NULL) {
+                        *p = 0;
+                    }
+                    if (*ptr != 0) {
+                        hPtr = WMGetHostWithName(ptr);
+                        if (hPtr) {
+                            if (!allowedHostList)
+                                allowedHostList = WMCreateArray(4);
+                            WMAddToArray(allowedHostList, hPtr);
+                        } else {
+                            wwarning(_("Unknown host '%s'. Ignored."), ptr);
+                        }
+                    }
+
+                    if (p!=NULL) {
+                        *p = ',';
+                        ptr = p+1;
+                    } else {
+                        done = 1;
+                    }
+                }
+            } else {
+                printf(_("%s: invalid argument '%s'\n"), argv[0], argv[i]);
+                printf(_("Try '%s --help' for more information\n"), argv[0]);
+                exit(1);
+            }
+        }
+    }
+
+    timeDB = WMGetDefaultsFromPath("./UserTime.plist");
+
+    clientConnections = WMCreateArray(4);
+
+    /* A NULL ServerAddress means to listen on any address the host has.
+     * Else if ServerAddress points to a specific address (like "localhost",
+     * "host.domain.com" or "192.168.1.1"), then it will only listen on that
+     * interface and ignore incoming connections on the others. */
+    if (ServerAddress && strcasecmp(ServerAddress, "Any")==0)
+        ServerAddress = NULL;
+    if (ServerPort==NULL)
+        ServerPort = "34567";
+
+    printf("Server will listen on '%s:%s'\n", ServerAddress?ServerAddress:"Any",
+           ServerPort);
+    printf("This server will allow connections from:");
+    if (allowedHostList) {
+        int i;
+        char *hName;
+
+        for (i=0; i<WMGetArrayItemCount(allowedHostList); i++) {
+            hName = WMGetHostName(WMGetFromArray(allowedHostList, i));
+            printf("%s'%s'", i==0?" ":", ", hName);
+        }
+        printf(".\n");
+    } else {
+        printf(" any host.\n");
+    }
+
+    serverPtr = WMCreateConnectionAsServerAtAddress(ServerAddress, ServerPort,
+                                                    NULL);
+
+    if (!serverPtr) {
+        wfatal("could not create server on `%s:%s`. Exiting.",
+               ServerAddress ? ServerAddress : "localhost", ServerPort);
+        exit(1);
+    }
+
+    WMSetConnectionDelegate(serverPtr, &socketDelegate);
+
+    WMAddNotificationObserver(removeConnection, NULL,
+                              SEConnectionShouldBeRemovedNotification, NULL);
+
+    while (1) {
+        /* The ASAP notification queue is called at the end of WHandleEvents()
+         * There's where died connections we get while running through
+         * WHandleEvents() get removed. */
+        WHandleEvents();
+    }
+
+    return 0;
+}
+
+