diff --git a/Config b/Config
index c98a61c08b111fd9cf1666115486f0671f923f83..68807365767d5437ad3185ff91a4c5b723053790 100755
--- a/Config
+++ b/Config
@@ -1,9 +1,11 @@
 #!/bin/sh
-# $Id: Config,v 1.3 1991/08/30 03:16:52 ceder Exp $
+# $Id: Config,v 1.4 1991/09/03 22:12:52 ceder Exp $
 
 x=
 
-[ -d include ] || mkdir include
+[ -d include ] && rm -rf include
+mkdir include
+
 case "$1" in
 +help | +hel | +he | +h | -h | -H)
 	echo Usage: ./Config hosttype
@@ -11,7 +13,7 @@ case "$1" in
 	echo	balance    sparc;;
 balance)
 	x=balance;;
-sun4 | sun4os4 | sparc | sparcos4)	
+sun3 | sun3os4 | sun4 | sun4os4 | sparc | sparcos4) 
 	x=sun4os4;;
 *)	echo Unsupported host type "$1".
 	x=error;;
@@ -20,8 +22,19 @@ esac
 case "$x" in
 error)	false;;
 *)
-	rm -f include/m-config.h
 	rm -f scripts/import.make
 	ln -s ../config/${x}-config.h include/m-config.h
-	ln -s ../config/${x}-defs.make scripts/import.make;;
+	ln -s ../config/${x}-defs.make scripts/import.make
+	ln -s ../src/include/ansi/${x} include/ansi
+	cd include/ansi
+	cat links | while read link target; do	\
+		rm ${link};			\
+		ln -s ../${target-Templates}/${link} ${link};	\
+	done
+
+	cd sys
+	cat links | while read link target; do	\
+		rm ${link};			\
+		ln -s ../../${target-Templates}/sys/${link} ${link};	\
+	done;;
 esac
diff --git a/Makefile b/Makefile
index 1a34e5d6d18961b53aa03f426ff1b06c0cafc71f..36e0be3f310fcaa028e0ec40f12a88281e7a3a6f 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,7 @@ SERVER-VER = 1.0
 
 all: msg includes libraries binaries end-msg
 
-includes: $(INCLUDEDIR)/m-config.h
-	-mkdir $(INCLUDEDIR)
+includes: $(INCLUDEDIR) $(INCLUDEDIR)/m-config.h
 	for i in $(SUBDIRS) ;	\
 	do	\
 		[ -d $$i ] && { echo making includes in directory $$i; \
@@ -17,7 +16,7 @@ includes: $(INCLUDEDIR)/m-config.h
 	done
 
 
-libraries: $(INCLUDEDIR)/m-config.h
+libraries: $(INCLUDEDIR) $(INCLUDEDIR)/m-config.h
 	-mkdir $(LIBDIR)
 	for i in $(SUBDIRS) ;	\
 	do	\
@@ -40,7 +39,7 @@ clean:
 	   (cd $$i; $(MAKE) $(EXPORTS) clean) } \
 	done
 
-depend: $(INCLUDEDIR)/m-config.h msg includes
+depend: $(INCLUDEDIR) $(INCLUDEDIR)/m-config.h msg includes
 
 distribution: clean
 	-$(RM) -r lyskom-$(SERVER-VER)
@@ -76,7 +75,6 @@ end-msg:
 	@echo Finished at
 	@date
 
-$(INCLUDEDIR)/m-config.h:
+$(INCLUDEDIR) $(INCLUDEDIR)/m-config.h:
 	@echo You must run Config before Build or make.
 	@exit 1
-
diff --git a/src/include/Makefile b/src/include/Makefile
index 874c74940706ce6aa6438b124b5b6a1ea6c1e395..63bd44d46ebbad3b45e446998cf7456886bc6f84 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -1,10 +1,8 @@
-TOPDIR = /usr/lyskom/src
+TOPDIR = /usr/lyskom
 SCRIPTDIR = $(TOPDIR)/scripts
 
 include $(SCRIPTDIR)/import.make
 
-TARGET = -DCLIENT
-
 SUBDIRS = ansi server 
 
 INSTALL-HDRS = $(wildcard *.h)