diff --git a/MAC/APL/PAC/BeamServer/src/Makefile.am b/MAC/APL/PAC/BeamServer/src/Makefile.am
index 8d1dafb3dbfc0f799b56450956510466403931f7..7a95e86495c334656eb38d6915ec7b1f5ac80f99 100644
--- a/MAC/APL/PAC/BeamServer/src/Makefile.am
+++ b/MAC/APL/PAC/BeamServer/src/Makefile.am
@@ -42,8 +42,6 @@ BeamServer_DEPENDENCIES		= $(LOFAR_DEPEND)
 
 beamctl_SOURCES 		= beamctl.h beamctl.cc
 
-bin_SCRIPTS 			= beamserver
-
 %.ph: %.prot
 	$(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
 
diff --git a/MAC/APL/PAC/BeamServer/src/beamserver.in b/MAC/APL/PAC/BeamServer/src/beamserver.in
deleted file mode 100644
index 719285c0f720aa3bf895040cc58894f728ee7ed3..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/BeamServer/src/beamserver.in
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/bash
-#
-# beamserver	This shell script takes care of starting and stopping
-#		the BeamServer
-#
-# chkconfig: - 58 74
-# description: beamserver is the script that starts or stops the BeamServer. \
-# The BeamServer controls the definition and control of Remote Station beams.
-
-# Source function library.
-. /etc/init.d/functions
-
-PREFIX=`dirname $0`/..
-
-if [ -f $PREFIX/etc/sysconfig/beamserver ];then
-        . $PREFIX/etc/sysconfig/beamserver
-fi
-
-# intialize variables
-RETVAL=0
-prog="BeamServer"
-
-# Check preconditions
-# These files must exist
-[ -x $PREFIX/bin/$prog ] || exit 0
-[ -e $PREFIX/etc/$prog.conf ] || exit 0
-
-start() {
-    #
-    # Check if running as root
-    #
-    if [ "$USER" != "root" ]; then
-        echo Must run as root.
-	return 1
-    fi
-    
-    # check if it is already running
-    # then try to stop it first
-    if [ -f /var/lock/subsys/$prog ]; then
-	echo forcing restart...
-	status $prog
-	stop
-    fi
-
-    # set OPTIONS
-    OPTIONS="-d"
-
-    # Start BeamServer
-    echo -n $"Starting $prog: "
-
-    # create logging output directory and push it
-    # because BeamServer dumps logfiles in the current
-    # directory
-    mkdir -p $PREFIX/var/log
-    pushd $PREFIX/var/log > /dev/null
-
-    #
-    # start in the background
-    #
-    # we can use the relative path because we know we are in
-    # $PREFIX/var/log (with pushd on previous line)
-    #
-    daemon ../../bin/$prog $OPTIONS
-    RETVAL=$?
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
-    echo
-
-    # return to original directory
-    popd > /dev/null
-
-    return $RETVAL
-}
-
-stop() {
-    #
-    # Check if running as root
-    #
-    if [ "$USER" != "root" ]; then
-        echo Must run as root.
-	return 1
-    fi
-
-    # Stop BeamServer
-    echo -n $"Shutting down $prog: "
-    killproc $prog
-    RETVAL=$?
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-    echo
-    return $RETVAL
-}
-
-# See how we were called.
-case "$1" in
-  start)
-	start
-	RETVAL=$?
-        ;;
-  stop)
-	stop
-	RETVAL=$?
-        ;;
-  status)
-	status $prog
-	RETVAL=$?
-	;;
-  restart|reload)
-	stop
-	start
-	RETVAL=$?
-	;;
-  condrestart)
-	if [ -f /var/lock/subsys/$prog ]; then
-	    stop
-	    start
-	    RETVAL=$?
-	fi
-	;;
-  *)
-        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-        exit 1
-esac
-
-exit $RETVAL
diff --git a/MAC/APL/PAC/CalServer/src/Makefile.am b/MAC/APL/PAC/CalServer/src/Makefile.am
index 478818ca88107b4e2b32b46ed9a1f6084f2b9cfb..81a9c9f9b35b9843a9e668d27600c2f3c827e3a4 100644
--- a/MAC/APL/PAC/CalServer/src/Makefile.am
+++ b/MAC/APL/PAC/CalServer/src/Makefile.am
@@ -65,9 +65,10 @@ libcaldevel_la_SOURCES = Package__Version.cc  \
 
 bin_PROGRAMS = versioncalserver \
 	CalServer \
-	juggle_acc \
 	calinfo
 
+sbin_PROGRAMS = juggle_acc
+
 CalServer_SOURCES = \
 	CalServer.h \
 	CalServer.cc \
@@ -89,9 +90,6 @@ CalServer_DEPENDENCIES = \
 	libcaldevel.la \
 	$(LOFAR_DEPEND)
 
-bin_SCRIPTS = \
-	calserver
-
 clean-local:
 	rm -f *.ph
 
diff --git a/MAC/APL/PAC/CalServer/src/calserver.in b/MAC/APL/PAC/CalServer/src/calserver.in
deleted file mode 100644
index 1c66168e9b5f61aed07768610746c8565aee3527..0000000000000000000000000000000000000000
--- a/MAC/APL/PAC/CalServer/src/calserver.in
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash
-#
-# calserver	This shell script takes care of starting and stopping
-#		the CalServer
-#
-# chkconfig: - 58 74
-# description: calserver is the script that starts or stops the CalServer. \
-# The CalServer controls the definition and calibration of Remote Station subarrays.
-
-# Source function library.
-. /etc/init.d/functions
-
-PREFIX=`dirname $0`/..
-
-if [ -f $PREFIX/etc/sysconfig/calserver ];then
-        . $PREFIX/etc/sysconfig/calserver
-fi
-
-# Check preconditions
-# These files must exist
-[ -x $PREFIX/bin/CalServer ] || exit 0
-[ -e $PREFIX/etc/CalServer.conf ] || exit 0
-
-RETVAL=0
-prog="CalServer"
-
-start() {
-    #
-    # Check if running as root
-    #
-    if [ "$USER" != "root" ]; then
-        echo Must run as root.
-	return 1
-    fi
-
-    # check if it is already running
-    if [ -f /var/lock/subsys/$prog ]; then
-	echo forcing restart...
-	status $prog
-	stop
-    fi
-
-    # set OPTIONS
-    OPTIONS="-d"
-
-    # Start CalServer
-    echo -n $"Starting $prog: "
-    
-    # create logging output directory and push it
-    # because BeamServer dumps logfiles in the current
-    # directory
-    mkdir -p $PREFIX/var/log
-    pushd $PREFIX/var/log > /dev/null
-
-    #
-    # start in the background
-    #
-    # we can use the relative path because we know we are in
-    # $PREFIX/var/log (with pushd on previous line)
-    #
-    daemon ../../bin/$prog $OPTIONS
-    RETVAL=$?
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
-    echo
-
-    # return to original directory
-    popd > /dev/null
-
-    return $RETVAL
-}
-
-stop() {
-    #
-    # Check if running as root
-    #
-    if [ "$USER" != "root" ]; then
-        echo Must run as root.
-	return 1
-    fi
-
-    # Stop CalServer
-    echo -n $"Shutting down $prog: "
-    killproc $prog
-    RETVAL=$?
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-    echo
-    return $RETVAL
-}
-
-# See how we were called.
-case "$1" in
-  start)
-	start
-	RETVAL=$?
-        ;;
-  stop)
-	stop
-	RETVAL=$?
-        ;;
-  status)
-	status $prog
-	RETVAL=$?
-	;;
-  restart|reload)
-	stop
-	start
-	RETVAL=$?
-	;;
-  condrestart)
-	if [ -f /var/lock/subsys/$prog ]; then
-	    stop
-	    start
-	    RETVAL=$?
-	fi
-	;;
-  *)
-        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-        exit 1
-esac
-
-exit $RETVAL
diff --git a/MAC/APL/PIC/RSPDriver/src/Makefile.am b/MAC/APL/PIC/RSPDriver/src/Makefile.am
index 58aea0b5534c5fc5a98125a4af2af45d87e6ec42..d7fce3f0706fdbd1a152962487774cf83b0bb2ed 100644
--- a/MAC/APL/PIC/RSPDriver/src/Makefile.am
+++ b/MAC/APL/PIC/RSPDriver/src/Makefile.am
@@ -48,13 +48,12 @@ libepa_la_SOURCES = Package__Version.cc  \
 	RawEvent.h \
 	RawEvent.cc
 
-bin_SCRIPTS = \
-	rspdriver
+sbin_SCRIPTS = \
+	geni2c
 
 bin_PROGRAMS = versionrspdriver \
 	RSPDriver \
-	rspctl \
-	geni2c
+	rspctl
 
 RSPDriver_SOURCES = $(RSPDriverFiles)
 
diff --git a/MAC/APL/PIC/RSPDriver/src/rspdriver.in b/MAC/APL/PIC/RSPDriver/src/rspdriver.in
deleted file mode 100644
index 1221f0adb8a5cff0a9b4207689374c3b75522f14..0000000000000000000000000000000000000000
--- a/MAC/APL/PIC/RSPDriver/src/rspdriver.in
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash
-#
-# rspdriver	This shell script takes care of starting and stopping
-#		the RSPDriver
-#
-# chkconfig: - 58 74
-# description: rspdriver is the script that starts or stops the RSPDriver. \
-# The RSPDriver controls one or more RSP boards
-
-# Source function library.
-. /etc/init.d/functions
-
-PREFIX=`dirname $0`/..
-
-if [ -f $PREFIX/etc/sysconfig/rspdriver ];then
-        . $PREFIX/etc/sysconfig/rspdriver
-fi
-
-#
-# initialize variables, set program name
-#
-RETVAL=0
-prog="RSPDriver"
-
-# Check preconditions
-# These files must exist
-[ -x $PREFIX/bin/$prog ] || exit 0
-[ -e $PREFIX/etc/$prog.conf ] || exit 0
-[ -e $PREFIX/etc/RemoteStation.conf ] || exit 0
-
-start() {
-    #
-    # Check if running as root
-    #
-    if [ "$USER" != "root" ]; then
-        echo Must run as root.
-	return 1
-    fi
-
-    # check if it is already running
-    if [ -f /var/lock/subsys/$prog ]; then
-	echo forcing restart...
-	status $prog
-	stop
-    fi
-
-    # -d means start in the background as daemon
-    OPTIONS="-d"
-
-    # Start RSPDriver
-    echo -n $"Starting $prog: "
-
-    # create logging output directory and push it
-    # because RSPDriver dumps logfiles in the current
-    # directory
-    mkdir -p $PREFIX/var/log
-    pushd $PREFIX/var/log > /dev/null
-
-    #
-    # start in the background with nicelevel -20 (highest priority)
-    #
-    # we can use the relative path because we know we are in
-    # $PREFIX/var/log (with pushd on previous line)
-    #
-    daemon -20 ../../bin/$prog $OPTIONS
-    RETVAL=$?
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
-    echo
-
-    # return to original directory
-    popd > /dev/null
-
-    return $RETVAL
-}
-
-stop() {
-    #
-    # Check if running as root
-    #
-    if [ "$USER" != "root" ]; then
-	echo Must run as root.
-	return 1
-    fi
-
-    # Stop RSPDriver
-    echo -n $"Shutting down $prog: "
-    killproc $prog
-    RETVAL=$?
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-    echo
-    return $RETVAL
-}
-
-# See how we were called.
-case "$1" in
-  start)
-	start
-	RETVAL=$?
-        ;;
-  stop)
-	stop
-	RETVAL=$?
-        ;;
-  status)
-	status $prog
-	RETVAL=$?
-	;;
-  restart|reload)
-	stop
-	start
-	RETVAL=$?
-	;;
-  condrestart)
-	if [ -f /var/lock/subsys/$prog ]; then
-	    stop
-	    start
-	    RETVAL=$?
-	fi
-	;;
-  *)
-        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-        exit 1
-esac
-
-exit $RETVAL
diff --git a/MAC/APL/PIC/RSPDriver/test/Makefile.am b/MAC/APL/PIC/RSPDriver/test/Makefile.am
index af44bbdc961fdff0fc41173c6d020ec15fd3c01c..7472ac6e8a57e6d00a478439ea04de95bb9ebb14 100644
--- a/MAC/APL/PIC/RSPDriver/test/Makefile.am
+++ b/MAC/APL/PIC/RSPDriver/test/Makefile.am
@@ -7,11 +7,11 @@ AM_CPPFLAGS = \
 # 	RSPTest \
 # 	EPAStub
 
-bin_PROGRAMS = \
+sbin_PROGRAMS = \
 	EPAStub \
 	RSPTest
 
-bin_SCRIPTS = \
+sbin_SCRIPTS = \
 	beamtest \
 	wgtest
 
diff --git a/MAC/APL/PIC/TBBDriver/test/Makefile.am b/MAC/APL/PIC/TBBDriver/test/Makefile.am
index 6bd14e99be55fc9dc2d9e58ffb78bea05eff9c3b..ff596da939a4180255a74af6130a5060c047f094 100644
--- a/MAC/APL/PIC/TBBDriver/test/Makefile.am
+++ b/MAC/APL/PIC/TBBDriver/test/Makefile.am
@@ -1,10 +1,7 @@
-#<<<<<<< Makefile.am
-#=======
 check_PROGRAMS        =
 
 # programs to run through supplied checktools
 CHECKTOOLPROGS        =
-#ENDCHECKTOOLPROGS
 
 # scripts used to run tests
 #TESTSCRIPTS           =
@@ -22,8 +19,6 @@ XFAIL_TESTS           =
 #testprg_LDADD			= ../src/libtbbdriver.la
 #testprg_DEPENDENCIES		= ../src/libtbbdriver.la $(LOFAR_DEPEND)
 
-#>>>>>>> 1.2
-
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src
@@ -68,7 +63,7 @@ libtbbstub_la_SOURCES = \
 	StubRawEvent.h \
 	StubRawEvent.cc 
 
-bin_PROGRAMS = \
+sbin_PROGRAMS = \
 	TPStub \
 	TBBTest
 
diff --git a/MAC/APL/PIC/rsuctl/Makefile.am b/MAC/APL/PIC/rsuctl/Makefile.am
index 486ed534b232d89a111522979fa56746b46278c0..ec39e28071566f9f910a3b77a17cc55ee53d0ef2 100644
--- a/MAC/APL/PIC/rsuctl/Makefile.am
+++ b/MAC/APL/PIC/rsuctl/Makefile.am
@@ -1,5 +1,5 @@
 
-bin_SCRIPTS = \
+sbin_SCRIPTS = \
 	rsuctl\
 	rsuctl3.pl
 
diff --git a/MAC/APL/TestCtlr/src/Makefile.am b/MAC/APL/TestCtlr/src/Makefile.am
index dc6193b7674d24cd856b73e7d6e0354e311b206b..6936fb5a12fa274ae6c0ec7b12c77fc21ca7c189 100644
--- a/MAC/APL/TestCtlr/src/Makefile.am
+++ b/MAC/APL/TestCtlr/src/Makefile.am
@@ -1,5 +1,5 @@
 
-bin_PROGRAMS 				= versiontestctlr ControllerMenu TestController CodeLoggingTest
+sbin_PROGRAMS 				= versiontestctlr ControllerMenu TestController CodeLoggingTest
 
 ControllerMenu_CPPFLAGS		= -DBOOST_DISABLE_THREADS \
 							  -Wno-deprecated \