diff --git a/src/server/Makefile b/src/server/Makefile
index ed0e6c0cd347430336d0a67da2aaf21e7d89f1e1..bd5eb16cf401680a1e4e85e590545672dcb601d5 100755
--- a/src/server/Makefile
+++ b/src/server/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 0.16 1991/09/19 13:10:29 ceder Exp $
+# $Id: Makefile,v 0.17 1991/09/22 08:24:46 ceder Exp $
 # Copyright (C) 1991  Lysator Academic Computer Association.
 #
 # This file is part of the LysKOM server.
@@ -22,7 +22,7 @@
 #
 # Please mail bug reports to bug-lyskom@lysator.liu.se. 
 #
-# $Id: Makefile,v 0.16 1991/09/19 13:10:29 ceder Exp $
+# $Id: Makefile,v 0.17 1991/09/22 08:24:46 ceder Exp $
 
 include Topdir.make
 SCRIPTDIR = $(TOPDIR)/scripts
@@ -87,6 +87,9 @@ DBCK_SRCS = dbck.c dbck-cache.c ram-smalloc.c ram-parse.c server-config.c\
 	kom-types.c\
 	missing-ansi.c ram-output.c memory.c
 
+ENCRYPT = encrypt-passwd.o dbck-cache.o ram-smalloc.o ram-parse.o server-config.o\
+	kom-types.o\
+	missing-ansi.o ram-output.o memory.o
 
 SPECIALS = call-switch.incl com.h fnc-def-init.incl prot-a-parse-arg.c\
 	prot-a-parse-arg.h fncdef-no-str-limit.txt .gdbinit
@@ -106,6 +109,9 @@ libraries:;
 lyskomd: $(DISKOBJS) $(GENOBJS)
 	$(CC) $(LDFLAGS) -o lyskomd $(DISKOBJS) $(GENOBJS) $(LIBS)
 
+encrypt: $(ENCRYPT)
+	$(CC) $(LDFLAGS) -o enrypt $(ENCRYPT) $(LIBS)
+
 dbck: $(DBCK)
 	$(CC) $(LDFLAGS) -o dbck $(DBCK) $(LIBS)
 
diff --git a/src/server/server-config.c b/src/server/server-config.c
index 74f1bdddc46bddc315131f2842b35da12eb5a0a7..bd9d06510341a1b828f9cde88a2c1f9c0a06815e 100644
--- a/src/server/server-config.c
+++ b/src/server/server-config.c
@@ -1,5 +1,5 @@
 /*
- * $Id: server-config.c,v 0.13 1991/09/21 13:06:47 ceder Exp $
+ * $Id: server-config.c,v 0.14 1991/09/22 08:24:48 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.13 1991/09/21 13:06:47 ceder Exp $";
+static char *rcsid = "$Id: server-config.c,v 0.14 1991/09/22 08:24:48 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 = 1000;	/* Timeout to select() when totally idle.
+const int TIMEOUT = 100;	/* 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 = 1000;	/* Timeout to select() when garbing texts
+const int GARBTIMEOUT = 100;	/* Timeout to select() when garbing texts
 				   but not syncing. */
-const int SYNCTIMEOUT = 100;	/* Timeout to select() when syncing. */
+const int SYNCTIMEOUT = 10;	/* Timeout to select() when syncing. */
 
 /* Times in minutes. */
 const int GARB_INTERVAL = 60*24;    /* Minutes between deletion of