diff --git a/dummy/make_gen b/dummy/make_gen
index f3874952..cc39e4a9 100644
--- a/dummy/make_gen
+++ b/dummy/make_gen
@@ -6,9 +6,6 @@
 .SUFFIXES: 
 .SUFFIXES: .c .o .f
 
-VPATH=$(SRC)
-ROOT=..
-
 OBJ=dummy.o
 
 all: libdummy.a
diff --git a/dummy/makefile b/dummy/makefile
index 8f5a8ebc..66edfc10 100644
--- a/dummy/makefile
+++ b/dummy/makefile
@@ -1,15 +1,6 @@
-# Forwards the execution to a version specific makefile.
-# SICS_VERSION must be defined, else usage is printed
 # M. Zolliker 03.2005
 
-VERS_UNDEFINED=
-VERS_UNDEFINED$(SICS_VERSION)=version_undefined
-
-INCL_MF=makefile_$(SICS_VERSION)
-
--include $(INCL_MF)
-
-version_undefined:
+default:
 	@ echo ""
 	@ echo "Usage:"
 	@ echo ""
@@ -18,17 +9,4 @@ version_undefined:
 	@ echo '  where makefile_xxx is one of'
 	@ echo ""
 	@ ls -1 makefile_* | pr -t -o 4
-	@ echo ""
-	@ echo "Or, more convenient, define the following in the login script"
-	@ echo ""
-	@ echo "    setenv SICS_VERSION version_xxx     (assume we are using tcsh)"
-	@ echo ""
-	@ echo "  where version_xxx is one of"
-	@ echo ""
-	@ ls -1 makefile_* | cut -b 10-99 | pr -t -o 4
-	@ echo ""
-	@ echo "and then use simply"
-	@ echo ""
-	@ echo "    make [target]"
-	@ echo ""
 
diff --git a/dummy/makefile_alpha_dummy b/dummy/makefile_alpha_dummy
index d229f7bf..2d7f45c0 100644
--- a/dummy/makefile_alpha_dummy
+++ b/dummy/makefile_alpha_dummy
@@ -6,7 +6,7 @@
 #--------------------------------------------------------------------------
 
 CC       = cc
-CFLAGS   = -std1 -g $(DFORTIFY) -I$(SRC).. 
+CFLAGS   = -std1 -g $(DFORTIFY) -I.. 
 
 DUMMY=_dummy
 include ../alpha_def
diff --git a/dummy/makefile_linux_dummy b/dummy/makefile_linux_dummy
index 70731ab5..67ad6b35 100644
--- a/dummy/makefile_linux_dummy
+++ b/dummy/makefile_linux_dummy
@@ -6,8 +6,8 @@
 #--------------------------------------------------------------------------
 
 CC       = gcc
-CFLAGS   =  -g $(DFORTIFY) -I../$(SRC)
+CFLAGS   =  -g $(DFORTIFY) -I..
 
 DUMMY=_dummy
-include ../$(SRC)linux_def
-include $(SRC)make_gen
+include ../linux_def
+include make_gen
diff --git a/matrix/make_gen b/matrix/make_gen
index ae2db2ac..992e1d54 100644
--- a/matrix/make_gen
+++ b/matrix/make_gen
@@ -4,9 +4,6 @@
 # Mark Koennecke, November 1996
 #--------------------------------------------------------------------------
 
-VPATH=$(SRC)
-ROOT=..
-
 OBJ=   matadd.o matcreat.o matdet.o matdump.o matdurbn.o materr.o \
        matinv.o matmul.o matsolve.o matsub.o matsubx.o mattoepz.o \
        mattran.o
diff --git a/matrix/makefile b/matrix/makefile
index 8f5a8ebc..66edfc10 100644
--- a/matrix/makefile
+++ b/matrix/makefile
@@ -1,15 +1,6 @@
-# Forwards the execution to a version specific makefile.
-# SICS_VERSION must be defined, else usage is printed
 # M. Zolliker 03.2005
 
-VERS_UNDEFINED=
-VERS_UNDEFINED$(SICS_VERSION)=version_undefined
-
-INCL_MF=makefile_$(SICS_VERSION)
-
--include $(INCL_MF)
-
-version_undefined:
+default:
 	@ echo ""
 	@ echo "Usage:"
 	@ echo ""
@@ -18,17 +9,4 @@ version_undefined:
 	@ echo '  where makefile_xxx is one of'
 	@ echo ""
 	@ ls -1 makefile_* | pr -t -o 4
-	@ echo ""
-	@ echo "Or, more convenient, define the following in the login script"
-	@ echo ""
-	@ echo "    setenv SICS_VERSION version_xxx     (assume we are using tcsh)"
-	@ echo ""
-	@ echo "  where version_xxx is one of"
-	@ echo ""
-	@ ls -1 makefile_* | cut -b 10-99 | pr -t -o 4
-	@ echo ""
-	@ echo "and then use simply"
-	@ echo ""
-	@ echo "    make [target]"
-	@ echo ""
 
diff --git a/matrix/makefile_linux b/matrix/makefile_linux
index a349e678..addaf48b 100644
--- a/matrix/makefile_linux
+++ b/matrix/makefile_linux
@@ -6,9 +6,9 @@
 # Markus Zolliker, March 2003
 #--------------------------------------------------------------------------
 
-include ../$(SRC)linux_def
+include ../linux_def
 
 CC       = gcc
 CFLAGS   = -g $(DFORTIFY)
 
-include $(SRC)make_gen
+include make_gen
diff --git a/matrix/makefile_linux_dummy b/matrix/makefile_linux_dummy
index c65862fb..d2283722 100644
--- a/matrix/makefile_linux_dummy
+++ b/matrix/makefile_linux_dummy
@@ -1,2 +1,2 @@
 DUMMY=_dummy
-include $(SRC)makefile_linux
+include makefile_linux