diff --git a/tecs/Makefile b/tecs/Makefile
index 324557ec..78f12af0 100644
--- a/tecs/Makefile
+++ b/tecs/Makefile
@@ -3,27 +3,36 @@
 #
 # Markus Zolliker, March 2000
 #--------------------------------------------------------------------------
-LIBR_OBJ= coc_util.o myc_err.o myc_str.o myc_buf.o myc_time.o
-SERV_OBJ= tecs.o coc_server.o tecs_lsc.o tecs_serial.o coc_logfile.o tecs_data.o $(LIBR_OBJ)
-CLI_OBJ= tecs_cli.o coc_client.o $(LIBR_OBJ)
-TCLI_OBJ= sys_aunix.o sys_aunix_c.o $(CLI_OBJ)
-TECLI_OBJ= tecs_client.o tecs_plot.o tecs_for.o sys_util.o str.o instr_hosts.o $(TCLI_OBJ)
-
 #------------ for DigitalUnix (add -DFORTIFY to CFLAGS for fortified version)
 CC_alpha_osf1=cc
 CFLAGS_alpha_osf1= -std1 -g -warnprotos -I../ -I. -I../hardsup
+TECS_PLOT_alpha_osf1=f90 -c -u -g tecs_plot.f90
+TECLI_LIB_alpha_osf1=-L/data/lnslib/lib -lpgplot -lX11 -lXm -so_archive
+SYS_FILE_alpha_osf1=sys_aunix
 #CFLAGS_alpha_osf1= -std1 -g -warnprotos -I../ -I. -I../hardsup -DFORTIFY 
 
 #---------- for Redhat linux (change redhat_linux to the corresponding $OSTYPE)
 CC_i386_linux= gcc
 CFLAGS_i386_linux= -I/usr/local/include -I. -I../ -I../hardsup -DLINUX   -g 
-#------------ for Linux
+TECS_PLOT_i386_linux=f77 -c -u -g tecs_plot.for
+SYS_FILE_i386_linux=sys_linux
+#------------ for Linux (what type of Linux?)
 CC_what_linux=gcc
-CFLAGS_i386_linux = -fwritable-strings -DCYGNUS -DNONINTF -g -I../ -I. -I../hardsup
+CFLAGS_what_linux = -fwritable-strings -DCYGNUS -DNONINTF -g -I../ -I. -I../hardsup
 #------------
 
 CC=$(CC_$(MACHTYPE)_$(OSTYPE))
 CFLAGS=$(CFLAGS_$(MACHTYPE)_$(OSTYPE))
+TECS_PLOT=$(TECS_PLOT_$(MACHTYPE)_$(OSTYPE))
+TECLI_LIB=$(TECLI_LIB_$(MACHTYPE)_$(OSTYPE))
+SYS_FILE=$(SYS_FILE_$(MACHTYPE)_$(OSTYPE))
+
+LIBR_OBJ= coc_util.o myc_err.o myc_str.o myc_buf.o myc_time.o
+SERV_OBJ= tecs.o coc_server.o tecs_lsc.o tecs_serial.o coc_logfile.o tecs_data.o $(LIBR_OBJ)
+CLI_OBJ= tecs_cli.o coc_client.o $(LIBR_OBJ)
+TCLI_OBJ= $(SYS_FILE).o $(SYS_FILE)_c.o $(CLI_OBJ)
+TECLI_OBJ= tecs_client.o tecs_plot.o tecs_for.o sys_util.o str.o instr_hosts.o $(TCLI_OBJ)
+
 
 .f.o:
 	f77 -c -u -g $*.f
@@ -36,11 +45,10 @@ libtecsl.a: $(CLI_OBJ)
 	ar cr libtecsl.a $(CLI_OBJ)
 	ranlib libtecsl.a
 
-all: libtecsl.a bin/TecsServer bin/TecsClient rstart bin/keep_running
+all: libtecsl.a bin/TecsServer bin/TecsClient bin/keep_running
 
 tecs_plot.o: tecs_plot.f90
-	f90 -c -u -g tecs_plot.f90
-
+	$(TECS_PLOT)
 
 bin/TecsServer: $(SERV_OBJ)
 	- rm bin/TecsServer
@@ -49,21 +57,14 @@ bin/TecsServer: $(SERV_OBJ)
 
 bin/TecsClient: $(TECLI_OBJ)
 	f77 -o bin/TecsClient -g $(TECLI_OBJ) \
-           -L/data/lnslib/lib -lpgplot -so_archive -lreadline -ltermcap -lX11 -lXm
+           $(TECLI_LIB) -lreadline -ltermcap
 
 six: six.c term.c sys_select.c $(LIBR_OBJ)
-	$(CC) $(CFLAGS) -o six six.c term.c sys_select.c $(LIBR_OBJ) \
-           -L/data/lnslib/lib -so_archive -lreadline -ltermcap -lX11 -lXm
+	$(CC) $(CFLAGS) -o six six.c term.c sys_select.c $(LIBR_OBJ)
 
 rstart: rstart.c myc_str.o myc_err.o instr_hosts.o
 	$(CC) $(CFLAGS) -o rstart rstart.c myc_str.o myc_err.o instr_hosts.o
 
-serverd: serverd.c $(LIBR_OBJ) 
-	$(CC) $(CFLAGS) -o serverd serverd.c $(LIBR_OBJ)
-
-starts: starts.c $(LIBR_OBJ) 
-	$(CC) $(CFLAGS) -o starts starts.c $(LIBR_OBJ)
-
 bin/keep_running: keep_running.c
 	$(CC) $(CFLAGS) -o bin/keep_running keep_running.c        
 
diff --git a/tecs/sys_util.h b/tecs/sys_util.h
index 7bd30a9c..7d3c4e4a 100644
--- a/tecs/sys_util.h
+++ b/tecs/sys_util.h
@@ -39,7 +39,7 @@ void sys_ctrl_init(void);
 
 typedef int sys_adr_len; /* argument of accept and gethostbyadr */
 
-#define sys_ctrl_init(DUMMY) 0
+#define sys_ctrl_init() 0
 
 #else
 
diff --git a/tecs/tecs_client.f b/tecs/tecs_client.f
index 35bd6e31..a8d995c4 100644
--- a/tecs/tecs_client.f
+++ b/tecs/tecs_client.f
@@ -29,7 +29,7 @@
 	  if (line(1:l) .eq. 'off' .or. line(1:l) .eq. 'OFF') then
 	    call tecs_open(0, ' ', iret)
 	    if (iret .lt. 0) goto 91
-	    iret=tecs_quit_server()
+	    iret=tecs_quit_server(0)
 	    if (iret .lt. 0) goto 91
 	    goto 99
 	  endif