diff --git a/tecs/make_auto_gnumake b/tecs/make_auto_gnumake
new file mode 100644
index 00000000..dffbc551
--- /dev/null
+++ b/tecs/make_auto_gnumake
@@ -0,0 +1,7 @@
+# list of prerequisites including paths for VPATH
+Q=$^
+
+# Fortran/C source file name
+F=$<
+C=$<
+
diff --git a/tecs/make_auto_gnumakeno b/tecs/make_auto_gnumakeno
new file mode 100644
index 00000000..63df21e3
--- /dev/null
+++ b/tecs/make_auto_gnumakeno
@@ -0,0 +1,7 @@
+# list of prerequisites including paths for VPATH
+Q=$>
+
+# Fortran/C source file name
+F=$*.f
+C=$*.c
+
diff --git a/tecs/make_opt_llc b/tecs/make_opt_llc
new file mode 100644
index 00000000..2c57ab15
--- /dev/null
+++ b/tecs/make_opt_llc
@@ -0,0 +1,27 @@
+#---------------------------------------------------------------------------
+# Makefile options for the TECS Client library and TecsServer
+# for Redhat linux on llc3 or llc4
+#
+# Markus Zolliker, March 2003
+#--------------------------------------------------------------------------
+
+SINQ=/afs/psi.ch/project/sinq/linux
+SICS=..
+
+CC       = gcc
+FC       = g77
+CFLAGS   = -DLINUX -g
+FFLAGS   = -u -fvxt -g
+ARFLAGS  = cr
+
+# -- system dependent routines
+SYS_FILE =sys_linux
+
+# -- PGPLOT library
+PGLIB    =$(SINQ)/pgplot/libpgplot.a -L/usr/X11R6/lib -lX11
+
+# -- library for ASYNSRV
+HARDSUPLIB=$(SICS)/hardsup/libhlib.a
+
+# -- readline library
+RDLIB    =-lreadline -ltermcap
diff --git a/tecs/make_opt_tru64 b/tecs/make_opt_tru64
new file mode 100644
index 00000000..19a2abe3
--- /dev/null
+++ b/tecs/make_opt_tru64
@@ -0,0 +1,27 @@
+#---------------------------------------------------------------------------
+# Makefile options for the TECS Client library and TecsServer
+# for Redhat linux on llc3 or llc4
+#
+# Markus Zolliker, March 2003
+#--------------------------------------------------------------------------
+
+SINQ=/afs/psi.ch/project/sinq/linux
+SICS=..
+
+CC       = cc
+FC       = f77
+CFLAGS   = -std1 -g -warnprotos
+FFLAGS   = -u -g
+#ARFLAGS  = cr
+
+# -- system dependent routines
+SYS_FILE =sys_linux
+
+# -- PGPLOT library
+PGLIB    =$(PGPLOT_DIR)/libpgplot.a -L/usr/X11R6/lib -lX11
+
+# -- library for ASYNSRV
+HARDSUPLIB=$(SICS)/hardsup/libhlib.a
+
+# -- readline library
+RDLIB    =-lreadline -ltermcap
diff --git a/tecs/make_tecs b/tecs/make_tecs
index f7ef72f4..8fd48119 100644
--- a/tecs/make_tecs
+++ b/tecs/make_tecs
@@ -6,7 +6,14 @@
 # included in a machine-specific makefile
 #--------------------------------------------------------------------------
 
-include make_opt
+include $(MAKE_OPT)
+
+VPATH=$(SRCPATH)
+
+# make replacements for some automatic variables
+# (define $Q $C and $F)
+GNUMAKE_$(MAKE_VERSION)=no
+include $(SRCPATH)make_auto_gnumake$(GNUMAKE_)
 
 LIBR_OBJ  =coc_util.o myc_err.o myc_str.o myc_buf.o myc_time.o \
            $(FORTIFYOBJ)
diff --git a/tecs/make_tecs_no b/tecs/make_tecs_no
new file mode 100644
index 00000000..81d481f6
--- /dev/null
+++ b/tecs/make_tecs_no
@@ -0,0 +1,6 @@
+default:
+
+%:
+	@echo "define the environment variable MACHINE to one of:"
+	@ls make_opt_* | cut -b 10-99
+
diff --git a/tecs/makefile b/tecs/makefile
index 3a1aed9a..fa755730 100644
--- a/tecs/makefile
+++ b/tecs/makefile
@@ -1 +1,10 @@
-include make_tecs
+# if MACHINE is defined, include make_tecs
+# else include make_tecs_no, printing out a comment
+
+T_$(MACHINE)=_no
+
+MAKE_OPT=make_opt_$(MACHINE)
+
+include make_tecs$(T_)
+
+