diff --git a/src/server/ChangeLog b/src/server/ChangeLog
index 569795e2abdcfc851a72ade9b16daec234b3e972..2517619bd6c7ff121d5f122e91c13496d42a2723 100644
--- a/src/server/ChangeLog
+++ b/src/server/ChangeLog
@@ -1,5 +1,10 @@
 Sat Sep 21 02:12:24 1991  Per Cederqvist  (ceder at lysator)
 
+	* "isc.h" is now known as "isc-interface.h" to avoid confusion
+	  with <isc.h>.
+
+	* version.incl: Go 1.0.2.
+
 	* ram-smalloc.c: Added support for memory leak finding.
 
 	* trace-mem.gdb, handle-malloc-dump.el: Useful for finding memory 
diff --git a/src/server/connections.c b/src/server/connections.c
index a2ef5320829b80330c93dc1c6ae5e9123c9a3452..566fc7105286c0248aa61d3795add48917703235 100644
--- a/src/server/connections.c
+++ b/src/server/connections.c
@@ -1,5 +1,5 @@
 /*
- * $Id: connections.c,v 0.10 1991/09/15 10:32:48 linus Exp $
+ * $Id: connections.c,v 0.11 1991/09/21 13:07:03 ceder Exp $
  * Copyright (C) 1991  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -30,7 +30,7 @@
  * Created by Willf|r 31/3-90. Mostly written by ceder.
  */
 
-static char *rcsid = "$Id: connections.c,v 0.10 1991/09/15 10:32:48 linus Exp $";
+static char *rcsid = "$Id: connections.c,v 0.11 1991/09/21 13:07:03 ceder Exp $";
 
 
 #include <errno.h>
@@ -49,7 +49,7 @@ static char *rcsid = "$Id: connections.c,v 0.10 1991/09/15 10:32:48 linus Exp $"
 #include "end-of-atomic.h"
 #include "log.h"
 #include <services.h>
-#include "isc.h"
+#include "isc-interface.h"
 #include <kom-errno.h>
 #include "com.h"
 #include "connections.h"
diff --git a/src/server/membership.c b/src/server/membership.c
index 135e9a034db8b775986f6c1f5d70da6964c1613a..07239fe5bfceee99e6198ee8e6f859c8295c6ca0 100644
--- a/src/server/membership.c
+++ b/src/server/membership.c
@@ -1,5 +1,5 @@
 /*
- * $Id: membership.c,v 0.5 1991/09/15 10:31:15 linus Exp $
+ * $Id: membership.c,v 0.6 1991/09/21 13:07:01 ceder Exp $
  * Copyright (C) 1991  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -29,7 +29,7 @@
  * (The person/conf relation).
  */
 
-static char *rcsid = "$Id: membership.c,v 0.5 1991/09/15 10:31:15 linus Exp $";
+static char *rcsid = "$Id: membership.c,v 0.6 1991/09/21 13:07:01 ceder Exp $";
 
 #include <time.h>
 #include <stdlib.h>
@@ -42,7 +42,7 @@ static char *rcsid = "$Id: membership.c,v 0.5 1991/09/15 10:31:15 linus Exp $";
 #include "log.h"
 #include "minmax.h"
 #include "com.h"
-#include "isc.h"
+#include "isc-interface.h"
 #include "connections.h"
 #include "send-async.h"
 #include <kom-errno.h>
diff --git a/src/server/mux-parse.c b/src/server/mux-parse.c
index b5e0b6492ca70ebfff3f72990e825495d41268d8..d84e74bc3accda2282926287b8ada97554530b6d 100644
--- a/src/server/mux-parse.c
+++ b/src/server/mux-parse.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mux-parse.c,v 0.7 1991/09/15 10:30:54 linus Exp $
+ * $Id: mux-parse.c,v 0.8 1991/09/21 13:07:00 ceder Exp $
  * Copyright (C) 1991  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -27,7 +27,7 @@
  * This is a hack. Clean this mess up with lacgen.
  */
 
-static char *rcsid = "$Id: mux-parse.c,v 0.7 1991/09/15 10:30:54 linus Exp $";
+static char *rcsid = "$Id: mux-parse.c,v 0.8 1991/09/21 13:07:00 ceder Exp $";
 
  
 #include <stddef.h>
@@ -38,7 +38,7 @@ static char *rcsid = "$Id: mux-parse.c,v 0.7 1991/09/15 10:30:54 linus Exp $";
 #include <kom-types.h>
 #include "com.h"
 #include "connections.h"
-#include "isc.h"
+#include "isc-interface.h"
 #include "mux.h"
 #include <server/smalloc.h>
 #include <setjmp.h>
diff --git a/src/server/mux.c b/src/server/mux.c
index cf6e8d2d1257e3c6827dd791f5c7c47a5a43c24b..37f95b5112f4dbffa1755922c080cbd874a1bfed 100644
--- a/src/server/mux.c
+++ b/src/server/mux.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mux.c,v 0.6 1991/09/21 12:13:08 ceder Exp $
+ * $Id: mux.c,v 0.7 1991/09/21 13:06:58 ceder Exp $
  * Copyright (C) 1991  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -26,7 +26,7 @@
 ** mux.c
 */
 
-static char *rcsid = "$Id: mux.c,v 0.6 1991/09/21 12:13:08 ceder Exp $";
+static char *rcsid = "$Id: mux.c,v 0.7 1991/09/21 13:06:58 ceder Exp $";
 
  
 #include <stddef.h>
@@ -37,7 +37,7 @@ static char *rcsid = "$Id: mux.c,v 0.6 1991/09/21 12:13:08 ceder Exp $";
 #include <kom-types.h>
 #include "com.h"
 #include "connections.h"
-#include "isc.h"
+#include "isc-interface.h"
 #include "mux.h"
 #include <server/smalloc.h>
 
diff --git a/src/server/prot-a-output.c b/src/server/prot-a-output.c
index 70c679562cceb0b7627b29af456252ece579c6d1..1accbe94012c80130f0abc8a4b92baa259198e49 100644
--- a/src/server/prot-a-output.c
+++ b/src/server/prot-a-output.c
@@ -1,5 +1,5 @@
 /*
- * $Id: prot-a-output.c,v 0.3 1991/09/15 10:30:29 linus Exp $
+ * $Id: prot-a-output.c,v 0.4 1991/09/21 13:06:56 ceder Exp $
  * Copyright (C) 1991  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -28,7 +28,7 @@
  * Written by ceder 1990-07-13
  */
 
-static char *rcsid = "$Id: prot-a-output.c,v 0.3 1991/09/15 10:30:29 linus Exp $";
+static char *rcsid = "$Id: prot-a-output.c,v 0.4 1991/09/21 13:06:56 ceder Exp $";
 
 
 #include <kom-types.h>
@@ -39,7 +39,7 @@ static char *rcsid = "$Id: prot-a-output.c,v 0.3 1991/09/15 10:30:29 linus Exp $
 #include "com.h"
 #include "connections.h"
 #include "prot-a-output.h"
-#include "isc.h"
+#include "isc-interface.h"
 #include "mux.h"
 
 void
diff --git a/src/server/prot-a-send-async.c b/src/server/prot-a-send-async.c
index 9333e4f5119fda6e2cf0eba955e575f49a732b06..7da52244528b6ea5e9f202395ed0a4c89dfe6e88 100644
--- a/src/server/prot-a-send-async.c
+++ b/src/server/prot-a-send-async.c
@@ -1,5 +1,5 @@
 /*
- * $Id: prot-a-send-async.c,v 0.4 1991/09/15 10:30:04 linus Exp $
+ * $Id: prot-a-send-async.c,v 0.5 1991/09/21 13:06:55 ceder Exp $
  * Copyright (C) 1991  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -26,7 +26,7 @@
  * Asynchronous messages in protocol A.
  */
 
-static char *rcsid = "$Id: prot-a-send-async.c,v 0.4 1991/09/15 10:30:04 linus Exp $";
+static char *rcsid = "$Id: prot-a-send-async.c,v 0.5 1991/09/21 13:06:55 ceder Exp $";
 
 
 #include <stdio.h>
@@ -40,7 +40,7 @@ static char *rcsid = "$Id: prot-a-send-async.c,v 0.4 1991/09/15 10:30:04 linus E
 #include "prot-a-output.h"
 #include "manipulate.h"
 #include "log.h"
-#include "isc.h"
+#include "isc-interface.h"
 #include "mux.h"
 
 static void
diff --git a/src/server/prot-a.c b/src/server/prot-a.c
index c4089265ccb256e5fd15668b71bc3299c9699a1c..3c3fc006b2237bc1d7355d80e1df71980b042e5b 100644
--- a/src/server/prot-a.c
+++ b/src/server/prot-a.c
@@ -1,5 +1,5 @@
 /*
- * $Id: prot-a.c,v 0.7 1991/09/15 10:29:55 linus Exp $
+ * $Id: prot-a.c,v 0.8 1991/09/21 13:06:53 ceder Exp $
  * Copyright (C) 1991  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -26,7 +26,7 @@
  * Protocol A.
  */
 
-static char *rcsid = "$Id: prot-a.c,v 0.7 1991/09/15 10:29:55 linus Exp $";
+static char *rcsid = "$Id: prot-a.c,v 0.8 1991/09/21 13:06:53 ceder Exp $";
 
 
 #include <stdio.h>
@@ -43,7 +43,7 @@ static char *rcsid = "$Id: prot-a.c,v 0.7 1991/09/15 10:29:55 linus Exp $";
 #include "prot-a-output.h"
 #include "prot-a-parse.h"
 #include <debug.h>
-#include "isc.h"
+#include "isc-interface.h"
 #include "mux.h"
 
 BUGDECL;
diff --git a/src/server/ram-output.c b/src/server/ram-output.c
index db1b3136f4cc5e5fe246e7c4d7c457624192bd49..8ea1246a9e100304037853e3fd8dac89fb02ff73 100644
--- a/src/server/ram-output.c
+++ b/src/server/ram-output.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ram-output.c,v 0.3 1991/09/15 10:29:48 linus Exp $
+ * $Id: ram-output.c,v 0.4 1991/09/21 13:06:51 ceder Exp $
  * Copyright (C) 1991  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -33,7 +33,7 @@
  * (It worked - now saving is twice as fast.)
  */
 
-static char *rcsid = "$Id: ram-output.c,v 0.3 1991/09/15 10:29:48 linus Exp $";
+static char *rcsid = "$Id: ram-output.c,v 0.4 1991/09/21 13:06:51 ceder Exp $";
 
 
 #include <kom-types.h>
@@ -43,7 +43,7 @@ static char *rcsid = "$Id: ram-output.c,v 0.3 1991/09/15 10:29:48 linus Exp $";
 #include "lyskomd.h"
 #include "ram-output.h"
 #include "com.h"
-#include "isc.h"
+#include "isc-interface.h"
 #include "connections.h"
 #include "prot-a-output.h"
 #include "log.h"
diff --git a/src/server/ramkomd.c b/src/server/ramkomd.c
index 2a16d5bb1f2975a29d0ab047e1d3773ab43679dc..25aa3b9d1f64016b34ec0777280bf95d0f65a07b 100644
--- a/src/server/ramkomd.c
+++ b/src/server/ramkomd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ramkomd.c,v 0.22 1991/09/21 12:11:58 ceder Exp $
+ * $Id: ramkomd.c,v 0.23 1991/09/21 13:06:49 ceder Exp $
  * Copyright (C) 1991  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -31,7 +31,7 @@
  * It has grown! /ceder
  */
 
-static char *rcsid = "$Id: ramkomd.c,v 0.22 1991/09/21 12:11:58 ceder Exp $";
+static char *rcsid = "$Id: ramkomd.c,v 0.23 1991/09/21 13:06:49 ceder Exp $";
 
 
 #include <m-config.h>
@@ -58,7 +58,7 @@ static char *rcsid = "$Id: ramkomd.c,v 0.22 1991/09/21 12:11:58 ceder Exp $";
 #include <kom-errno.h>
 #include "internal-services.h"
 #include "lyskomd.h"
-#include "isc.h"
+#include "isc-interface.h"
 #include <isc-dump.h>
 #include <server/smalloc.h>
 #include "cache.h"
diff --git a/src/server/server-config.c b/src/server/server-config.c
index ac24f5a149c45dfe0c689428a98db3273fd82c2a..74f1bdddc46bddc315131f2842b35da12eb5a0a7 100644
--- a/src/server/server-config.c
+++ b/src/server/server-config.c
@@ -1,5 +1,5 @@
 /*
- * $Id: server-config.c,v 0.12 1991/09/15 10:29:15 linus Exp $
+ * $Id: server-config.c,v 0.13 1991/09/21 13:06:47 ceder Exp $
  * Copyright (C) 1991  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -32,7 +32,7 @@
 #include <config.h>
 #include <m-config.h>
 
-static char *rcsid = "$Id: server-config.c,v 0.12 1991/09/15 10:29:15 linus Exp $";
+static char *rcsid = "$Id: server-config.c,v 0.13 1991/09/21 13:06:47 ceder Exp $";
 
 
 
@@ -63,13 +63,13 @@ const char * DEFAULT_MUX_SERVICE    = "lyskom-mux";     /* Can be number! */
  *
  * GARBTIMEOUT and SYNCTIMEOUT are only used in diskomd.
  */
-const int TIMEOUT = 100;	/* Timeout to select() when totally idle.
+const int TIMEOUT = 1000;	/* Timeout to select() when totally idle.
 				 * Should be much larger. Is this small
 				 to work around the famous select bug
 				 in isc. */
-const int GARBTIMEOUT = 100;	/* Timeout to select() when garbing texts
+const int GARBTIMEOUT = 1000;	/* Timeout to select() when garbing texts
 				   but not syncing. */
-const int SYNCTIMEOUT = 10;	/* Timeout to select() when syncing. */
+const int SYNCTIMEOUT = 100;	/* Timeout to select() when syncing. */
 
 /* Times in minutes. */
 const int GARB_INTERVAL = 60*24;    /* Minutes between deletion of
diff --git a/src/server/simple-cache.c b/src/server/simple-cache.c
index 5ecd7811a4e523e9a0042da560adfb71ac8a58a8..1f2c3ac82156efe4bbef59c97b80fc10c760926b 100644
--- a/src/server/simple-cache.c
+++ b/src/server/simple-cache.c
@@ -1,5 +1,5 @@
 /*
- * $Id: simple-cache.c,v 0.16 1991/09/15 10:29:03 linus Exp $
+ * $Id: simple-cache.c,v 0.17 1991/09/21 13:06:45 ceder Exp $
  * Copyright (C) 1991  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -33,7 +33,7 @@
  * New save algorithm by ceder.
  */
 
-static char *rcsid = "$Id: simple-cache.c,v 0.16 1991/09/15 10:29:03 linus Exp $";
+static char *rcsid = "$Id: simple-cache.c,v 0.17 1991/09/21 13:06:45 ceder Exp $";
 
 
 
@@ -66,7 +66,7 @@ static char *rcsid = "$Id: simple-cache.c,v 0.16 1991/09/15 10:29:03 linus Exp $
 #include "ram-parse.h"
 #include "log.h"
 #include "com.h"
-#include "isc.h"
+#include "isc-interface.h"
 #include "ram-output.h"
 #include "connections.h"
 #include "prot-a-output.h"
diff --git a/src/server/text.c b/src/server/text.c
index 73a9e46b668a3aca484e3c5b156599306d735eb3..7516b8320245cc9543a8bc6a3e5b537444805a8b 100644
--- a/src/server/text.c
+++ b/src/server/text.c
@@ -1,5 +1,5 @@
 /*
- * $Id: text.c,v 0.5 1991/09/15 10:28:38 linus Exp $
+ * $Id: text.c,v 0.6 1991/09/21 13:06:43 ceder Exp $
  * Copyright (C) 1991  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -28,7 +28,7 @@
  * All atomic calls that deals with texts.
  */
 
-static char *rcsid = "$Id: text.c,v 0.5 1991/09/15 10:28:38 linus Exp $";
+static char *rcsid = "$Id: text.c,v 0.6 1991/09/21 13:06:43 ceder Exp $";
 
 #include <time.h>
 #include <stdlib.h>
@@ -43,7 +43,7 @@ static char *rcsid = "$Id: text.c,v 0.5 1991/09/15 10:28:38 linus Exp $";
 #include "minmax.h"
 #include <config.h>
 #include "com.h"
-#include "isc.h"
+#include "isc-interface.h"
 #include "connections.h"
 #include "send-async.h"
 #include "admin.h"
diff --git a/src/server/version.incl b/src/server/version.incl
index 7ec0135d99fe04485d5a4fda81ee44bb63dde267..cd42a5fb963b310371385a422bf1fa24f2c909c8 100644
--- a/src/server/version.incl
+++ b/src/server/version.incl
@@ -1,5 +1,5 @@
 /*
- * $Id: version.incl,v 0.19 1991/09/20 17:28:02 ceder Exp $
+ * $Id: version.incl,v 0.20 1991/09/21 13:06:40 ceder Exp $
  * Copyright (C) 1991  Lysator Academic Computer Association.
  *
  * This file is part of the LysKOM server.
@@ -22,4 +22,4 @@
  *
  * Please mail bug reports to bug-lyskom@lysator.liu.se. 
  */
-10001
+10002