diff --git a/sinqhm/Makefile b/sinqhm/Makefile
index 7f57231..7566710 100644
--- a/sinqhm/Makefile
+++ b/sinqhm/Makefile
@@ -10,17 +10,17 @@
 #--------------------------------------------------------------------------
 #
 #------------ for DigitalUnix (add -DFORTIFY to CFLAGS for fortified version)
-FF     = f90
-CC     = cc
-CFLAGS = -std -g -I. -I../hardsup -I$(PGPLOT_DIR) -I/data/koenneck/include
-BIN    = ../bin
-LFLAGS = -L../hardsup -L$PGPLOT_DIR -L/data/lnslib/lib -lX11
+#FF     = f90
+#CC     = cc
+#CFLAGS =  -g -I. -I../hardsup -I$(PGPLOT_DIR) -I/data/koenneck/include
+#BIN    = ../bin
+#LFLAGS = -L../hardsup -L$PGPLOT_DIR -L/data/lnslib/lib -lX11
 #------------ for Linux
-## FF     = g77
-## CC     = gcc
-## CFLAGS = -g -I. -I../hardsup -I$(PGPLOT_DIR) -DLINUX
-## BIN    = $(HOME)/bin
-## LFLAGS = -L../hardsup -L$PGPLOT_DIR -L/usr/X11R6/lib
+FF     = g77
+CC     = gcc
+CFLAGS = -g -I. -I../hardsup -I/afs/psi.ch/project/sinq/sl-linux/include -DLINUX
+BIN    = ./
+LFLAGS = -L../hardsup -L/afs/psi.ch/project/sinq/sl-linux/lib -L/usr/X11R6/lib
 #------------
 
 #----------------------------------------------------------
@@ -51,16 +51,10 @@ $(BIN)/sinqhm_ctrl: SinqHM_def.h sinqhm_ctrl.c
            mv -f $(BIN)/sinqhm_ctrl \
                  $(BIN)/sinqhm_ctrl.old; \
         fi
-	$(CC) $(CFLAGS) -o $(BIN)/sinqhm_ctrl \
-                   sinqhm_ctrl.c $(LFLAGS) -lhlib -lX11
+	$(CC) $(CFLAGS) -o $(BIN)/sinqhm_ctrl sinqhm_ctrl.c $(LFLAGS) -lhlib -lX11
 
-$(BIN)/sinqhm_client: SinqHM_def.h sinqhm_client.c
-	@ rm -f $(BIN)/sinqhm_client.old
-	@ if test -f $(BIN)/sinqhm_client; then \
-           mv -f $(BIN)/sinqhm_client \
-                 $(BIN)/sinqhm_client.old; \
-        fi
-	$(FF) $(CFLAGS) -nofor_main -o $(BIN)/sinqhm_client \
+sinqhm_client: SinqHM_def.h sinqhm_client.c
+	$(FF) $(CFLAGS) -nofor_main -o sinqhm_client \
                    sinqhm_client.c $(LFLAGS) -lhlib -lcpgplot -lpgplot -lX11
 
 $(BIN)/sinqhm_bootutil_client:  SinqHM_def.h \