diff --git a/hardsup/makefile_linux b/hardsup/makefile_linux
index 7c5971a..ed2141e 100644
--- a/hardsup/makefile_linux
+++ b/hardsup/makefile_linux
@@ -1,9 +1,10 @@
 #---------------------------------------------------------------------------
 # Makefile for the SINQ hardware support library
-# machine-dependent part for Redhat Linux with AFS at PSI
+# with libraries installed unde r/usr/local
 #
 # Mark Koennecke, November 1996
 # Markus Zolliker, March 2003
+# Mark Koennecke, December 2009
 #--------------------------------------------------------------------------
 
 include ../../linux_def
diff --git a/make_gen b/make_gen
index 16a188d..82fbe7a 100644
--- a/make_gen
+++ b/make_gen
@@ -44,4 +44,4 @@ dgrambroadcast.o: dgrambroadcast.h dgrambroadcast.c
 	$(CC) $(SINQOPT) -c -g dgrambroadcast.c
 
 sinq.o: sinq.c sinq.h dgrambroadcast.h
-	$(CC) $(SINQOPT) -I../ -g -c sinq.c
+	$(CC) -I$(TCLINC) $(SINQOPT) -I../ -g -c sinq.c
diff --git a/makefile_linux b/makefile_linux
index e35d8b5..764ac5c 100644
--- a/makefile_linux
+++ b/makefile_linux
@@ -1,16 +1,17 @@
 #---------------------------------------------------------------------------
 # Makefile for SICS
-# machine-dependent part for Redhat Linux with AFS at PSI
+# with libraries installed under /usr/local
 #
 # Mark Koennecke 1996-2001
 # Markus Zolliker, March 2003
+# Mark Koennecke, December 2009
 #==========================================================================
 
-include ../sllinux_def
+include ../linux_def
 
 
 CC       = gcc
-CFLAGS = -I$(HDFROOT)/include -DHDF4  -DHDF5 $(NI) -Ihardsup \
+CFLAGS = -I$(HDFROOT)/include -DHDF4  -DHDF5 $(NI) -I$(TCLINC) -Ihardsup \
        -I..  -MMD -DCYGNUS -DNONINTF -g  $(DFORTIFY)  \
        -Wall -Wno-unused -Wunused-value -Wno-comment -Wno-switch -Werror
 
diff --git a/tecs/pg_plus/makefile_linux b/tecs/pg_plus/makefile_linux
index e13d160..52c7b0a 100644
--- a/tecs/pg_plus/makefile_linux
+++ b/tecs/pg_plus/makefile_linux
@@ -1,7 +1,7 @@
 # Makefile for modifications to PGPLOT allowing for
 # timeout on cursor input for the devices VMAC, XWINDOW and XSERVE
 
-ORIG=/afs/psi.ch/project/sinq/sl-linux/distsrc/pgplot5.2.2
+ORIG=/usr/local/distsrc/pgplot5.2.2
 
 FFLAGS=-g -Wimplicit -Wall -g -I$(ORIG)
 CFLAGS=-g -DPG_PPU -I. -I/usr/X11R6/include
diff --git a/termprot.c b/termprot.c
index b51d486..7d4821f 100644
--- a/termprot.c
+++ b/termprot.c
@@ -1,9 +1,9 @@
 /*
  * This is yet another protocol for scriptcontext. This is for variable 
- * terminated protocols. The Astriums have delivered the SANS-2 NVS with
- * a protocol which uses a \n as a terminator most of the time but sometimes
- * a \. This protocol handler expects messages in the form: terminator:payload
- * The caller is responsible for providing the proper send terminator.
+ * terminated protocols. The Astriums have deliverd the SANS-2 NVS with 
+ * a protocol which uses a \n as a terminator most of teh time but sometimes 
+ * a \. This protocl handler expects messages in the form: terminator:payload
+ * The caller is responsible for providing the proper send termiantor.
  * 
  * copyright: see file COPYRIGHT
  * 
diff --git a/utils/makefile_linux b/utils/makefile_linux
index 60a40b6..986b07e 100644
--- a/utils/makefile_linux
+++ b/utils/makefile_linux
@@ -1,9 +1,10 @@
 #---------------------------------------------------------------------------
 # Makefile for the SINQ hardware utilities
-# machine-dependent part for Redhat Linux with AFS at PSI
+# with libraries at /usr/local
 #
 # Mark Koennecke, November 1996
 # Markus Zolliker, Oct 2003
+# Mark Koennecke, December 2009
 #--------------------------------------------------------------------------
 
 include ../../linux_def