diff --git a/MAC/APL/APLCommon/src/swlevel b/MAC/APL/APLCommon/src/swlevel
index fd40de6370890cad8883f05be135e2116a1e4ef9..e27514c1850a3e656121ba768a82b7a7bee80bca 100644
--- a/MAC/APL/APLCommon/src/swlevel
+++ b/MAC/APL/APLCommon/src/swlevel
@@ -584,8 +584,8 @@ print_level()
 
 show_lofar_version()
 {
-        if [ -e /opt/lofar/Version.txt ]; then
-          version=`cat /opt/lofar/Version.txt`
+        if [ -e $LOFARROOT/Version.txt ]; then
+          version=`cat $LOFARROOT/Version.txt`
 	  if [ "$1" = "v" ]; then  
             echo -n "Current LOFAR version is "
 	  fi
diff --git a/MAC/APL/APLCommon/src/swlevel.conf b/MAC/APL/APLCommon/src/swlevel.conf
index b9e9922bc3e9c9f8c98324c6576b1c8a59d9cf75..beebd757a9c254fde3629565dd710171fcbd948c 100644
--- a/MAC/APL/APLCommon/src/swlevel.conf
+++ b/MAC/APL/APLCommon/src/swlevel.conf
@@ -8,7 +8,7 @@
 1:u:d:::PVSS00pmon
 1:u:d:::SoftwareMonitor
 1:u:d:::LogProcessor
-#1:u:d:::LogClient
+1:u:d:::LogClient
 1:u:d:::ServiceBroker
 1:u:d:::SASGateway
 1:u:d:::PVSSGateway
diff --git a/MAC/APL/Appl_Controller/src/ACDaemon.log_prop b/MAC/APL/Appl_Controller/src/ACDaemon.log_prop
index f3755cbd6b73c997bf784c06d4ef9a18e0e18bdf..28ed434a527ac9515f2d9921cc2b69e492ef717d 100644
--- a/MAC/APL/Appl_Controller/src/ACDaemon.log_prop
+++ b/MAC/APL/Appl_Controller/src/ACDaemon.log_prop
@@ -15,7 +15,7 @@ log4cplus.appender.STDERR.layout.ConversionPattern=%D{%d-%m %H:%M:%S.%q} %-5p %c
 log4cplus.appender.STDERR.logToStdErr=true
 
 log4cplus.appender.FILE=log4cplus::RollingFileAppender
-log4cplus.appender.FILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
+log4cplus.appender.FILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
 log4cplus.appender.FILE.MaxFileSize=10MB
 log4cplus.appender.FILE.MaxBackupIndex=2
 log4cplus.appender.FILE.layout=log4cplus::PatternLayout
diff --git a/MAC/APL/Appl_Controller/src/ACuserMenu.log_prop b/MAC/APL/Appl_Controller/src/ACuserMenu.log_prop
index c405e630daa8bd5eedb288ad866813771742b006..f2ae8e9d8d29551c030496a86dd3e1e5891320da 100644
--- a/MAC/APL/Appl_Controller/src/ACuserMenu.log_prop
+++ b/MAC/APL/Appl_Controller/src/ACuserMenu.log_prop
@@ -15,7 +15,7 @@ log4cplus.appender.STDERR.layout.ConversionPattern=%D{%d-%m %H:%M:%S.%q} %-5p %c
 log4cplus.appender.STDERR.logToStdErr=true
 
 log4cplus.appender.FILE=log4cplus::RollingFileAppender
-log4cplus.appender.FILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
+log4cplus.appender.FILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
 log4cplus.appender.FILE.MaxFileSize=10MB
 log4cplus.appender.FILE.MaxBackupIndex=2
 log4cplus.appender.FILE.layout=log4cplus::PatternLayout
diff --git a/MAC/APL/Appl_Controller/src/ApplController.log_prop b/MAC/APL/Appl_Controller/src/ApplController.log_prop
index f3755cbd6b73c997bf784c06d4ef9a18e0e18bdf..28ed434a527ac9515f2d9921cc2b69e492ef717d 100644
--- a/MAC/APL/Appl_Controller/src/ApplController.log_prop
+++ b/MAC/APL/Appl_Controller/src/ApplController.log_prop
@@ -15,7 +15,7 @@ log4cplus.appender.STDERR.layout.ConversionPattern=%D{%d-%m %H:%M:%S.%q} %-5p %c
 log4cplus.appender.STDERR.logToStdErr=true
 
 log4cplus.appender.FILE=log4cplus::RollingFileAppender
-log4cplus.appender.FILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
+log4cplus.appender.FILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
 log4cplus.appender.FILE.MaxFileSize=10MB
 log4cplus.appender.FILE.MaxBackupIndex=2
 log4cplus.appender.FILE.layout=log4cplus::PatternLayout
diff --git a/MAC/APL/Appl_Controller/src/startAP.sh b/MAC/APL/Appl_Controller/src/startAP.sh
index ce8d145a1c57e8973112d16b82565aa61ec14b32..d16ae7044e5ced26160d84d63696b36dfd462017 100755
--- a/MAC/APL/Appl_Controller/src/startAP.sh
+++ b/MAC/APL/Appl_Controller/src/startAP.sh
@@ -21,4 +21,4 @@ $3 ACC $4 $2 &
 pid=`echo $!`
 
 # construct pid file for stop shell
-echo "$pid" > /opt/lofar/var/run/$2.pid
+echo "$pid" > $LOFARROOT/var/run/$2.pid
diff --git a/MAC/APL/Appl_Controller/src/stopAP.sh b/MAC/APL/Appl_Controller/src/stopAP.sh
index 1984d5a8a53eaee28706a52c5e607adedf99c2aa..5e0b9a0e8974b49f4166c084283b19a6cd8d238f 100755
--- a/MAC/APL/Appl_Controller/src/stopAP.sh
+++ b/MAC/APL/Appl_Controller/src/stopAP.sh
@@ -9,6 +9,6 @@
 # DISABLED this script: startBGL.sh starts all CEP processes
 exit
 
-echo -n "Killing process "; cat /opt/lofar/var/run/$2.pid
-kill -9 `cat /opt/lofar/var/run/$2.pid`
-rm -f /opt/lofar/var/run/$2.pid /opt/lofar/var/run/$2.parset
+echo -n "Killing process "; cat $LOFARROOT/var/run/$2.pid
+kill -9 `cat $LOFARROOT/var/run/$2.pid`
+rm -f $LOFARROOT/var/run/$2.pid $LOFARROOT/var/run/$2.parset
diff --git a/MAC/APL/CUDaemons/CT_StartDaemon/startController.sh b/MAC/APL/CUDaemons/CT_StartDaemon/startController.sh
index 4205492b0b0654505bed7adced200c3b04b4539c..bd989ec879f5bcd47f01a5af645104c10c71e7c3 100755
--- a/MAC/APL/CUDaemons/CT_StartDaemon/startController.sh
+++ b/MAC/APL/CUDaemons/CT_StartDaemon/startController.sh
@@ -1,10 +1,11 @@
+#!/bin/bash
 # startController.sh executable taskname parenthostname parentService
 #
 # start the given executable
 #
 
 # start process
-($1 $2 $3 $4 1 2>&1 | awk '{ print strftime("%Y-%m-%d %H:%M:%S"),$0; }' >>"/opt/lofar/var/log/$2.stdout") &
+($1 $2 $3 $4 1 2>&1 | awk '{ print strftime("%Y-%m-%d %H:%M:%S"),$0; }' >>"${LOFARROOT:-/opt/lofar}/var/log/$2.stdout") &
 
 # get its pid
 # echo $!
diff --git a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.log_prop b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.log_prop
index d629617d52738f4beb6db437a2975f9ebea2865e..ec2de3ef941dff25e9118c1f17f72650e1fa419f 100644
--- a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.log_prop
+++ b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.log_prop
@@ -18,14 +18,14 @@ log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
 log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S} %-5p %c{3} - %m [%.25l]%n
 
 log4cplus.appender.DAILYFILE=log4cplus::DailyRollingFileAppender
-log4cplus.appender.DAILYFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
+log4cplus.appender.DAILYFILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
 log4cplus.appender.DAILYFILE.Schedule=DAILY
 log4cplus.appender.DAILYFILE.MaxBackupIndex=14
 log4cplus.appender.DAILYFILE.layout=log4cplus::PatternLayout
 log4cplus.appender.DAILYFILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
 
 log4cplus.appender.FILE=log4cplus::RollingFileAppender
-log4cplus.appender.FILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
+log4cplus.appender.FILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
 log4cplus.appender.FILE.MaxFileSize=10MB
 log4cplus.appender.FILE.MaxBackupIndex=9
 log4cplus.appender.FILE.layout=log4cplus::PatternLayout
diff --git a/MAC/APL/Log_Client/src/LogClient.log_prop b/MAC/APL/Log_Client/src/LogClient.log_prop
index 215fd0cea80d2bc04b00b287674fd28b1d2c66fe..39d27918278aed3152d0ad96f9438c791834cfca 100644
--- a/MAC/APL/Log_Client/src/LogClient.log_prop
+++ b/MAC/APL/Log_Client/src/LogClient.log_prop
@@ -33,14 +33,14 @@ log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
 log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S} %-5p %c{3} - %m [%.25l]%n
 
 log4cplus.appender.DAILYFILE=log4cplus::DailyRollingFileAppender
-log4cplus.appender.DAILYFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
+log4cplus.appender.DAILYFILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
 log4cplus.appender.DAILYFILE.Schedule=DAILY
 log4cplus.appender.DAILYFILE.MaxBackupIndex=14
 log4cplus.appender.DAILYFILE.layout=log4cplus::PatternLayout
 log4cplus.appender.DAILYFILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S} %-5p %c{3} - %m [%.25l]%n
 
 log4cplus.appender.ROLFILE=log4cplus::RollingFileAppender
-log4cplus.appender.ROLFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
+log4cplus.appender.ROLFILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
 log4cplus.appender.ROLFILE.MaxFileSize=10MB
 log4cplus.appender.ROLFILE.MaxBackupIndex=9
 log4cplus.appender.ROLFILE.layout=log4cplus::PatternLayout
diff --git a/MAC/GCF/TM/src/mac.log_prop b/MAC/GCF/TM/src/mac.log_prop
index ae4171def5f96d8d54673fff3617944859de8510..1f044c7eb142cbee63f0fc44453ff935e8ce8906 100644
--- a/MAC/GCF/TM/src/mac.log_prop
+++ b/MAC/GCF/TM/src/mac.log_prop
@@ -33,14 +33,14 @@ log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
 log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
 
 log4cplus.appender.DAILYFILE=log4cplus::DailyRollingFileAppender
-log4cplus.appender.DAILYFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
+log4cplus.appender.DAILYFILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
 log4cplus.appender.DAILYFILE.Schedule=DAILY
 log4cplus.appender.DAILYFILE.MaxBackupIndex=14
 log4cplus.appender.DAILYFILE.layout=log4cplus::PatternLayout
 log4cplus.appender.DAILYFILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
 
 log4cplus.appender.ROLFILE=log4cplus::RollingFileAppender
-log4cplus.appender.ROLFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
+log4cplus.appender.ROLFILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
 log4cplus.appender.ROLFILE.MaxFileSize=10MB
 log4cplus.appender.ROLFILE.MaxBackupIndex=9
 log4cplus.appender.ROLFILE.layout=log4cplus::PatternLayout
diff --git a/MAC/GCF/TM/src/mac_debug.log_prop b/MAC/GCF/TM/src/mac_debug.log_prop
index e63ba0eba91602bf2b958ec7e3ec6c94722417da..05a7c3001f7b7d4376299db633288dd1037270a0 100644
--- a/MAC/GCF/TM/src/mac_debug.log_prop
+++ b/MAC/GCF/TM/src/mac_debug.log_prop
@@ -33,14 +33,14 @@ log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
 log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
 
 log4cplus.appender.DAILYFILE=log4cplus::DailyRollingFileAppender
-log4cplus.appender.DAILYFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
+log4cplus.appender.DAILYFILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
 log4cplus.appender.DAILYFILE.Schedule=DAILY
 log4cplus.appender.DAILYFILE.MaxBackupIndex=14
 log4cplus.appender.DAILYFILE.layout=log4cplus::PatternLayout
 log4cplus.appender.DAILYFILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
 
 log4cplus.appender.ROLFILE=log4cplus::RollingFileAppender
-log4cplus.appender.ROLFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
+log4cplus.appender.ROLFILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
 log4cplus.appender.ROLFILE.MaxFileSize=10MB
 log4cplus.appender.ROLFILE.MaxBackupIndex=9
 log4cplus.appender.ROLFILE.layout=log4cplus::PatternLayout
diff --git a/MAC/GCF/TM/src/mac_nopvss.log_prop b/MAC/GCF/TM/src/mac_nopvss.log_prop
index 7d9b58233e7cdcf5fec6a7582a6fa29c77a3681e..f65f272a4a6f0957ca5930cd073e01aae758e57a 100644
--- a/MAC/GCF/TM/src/mac_nopvss.log_prop
+++ b/MAC/GCF/TM/src/mac_nopvss.log_prop
@@ -37,14 +37,14 @@ log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
 log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
 
 log4cplus.appender.DAILYFILE=log4cplus::DailyRollingFileAppender
-log4cplus.appender.DAILYFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
+log4cplus.appender.DAILYFILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
 log4cplus.appender.DAILYFILE.Schedule=DAILY
 log4cplus.appender.DAILYFILE.MaxBackupIndex=14
 log4cplus.appender.DAILYFILE.layout=log4cplus::PatternLayout
 log4cplus.appender.DAILYFILE.layout.ConversionPattern=%x %D{%d-%m-%y %H:%M:%S.%q} %-5p %c{3} - %m [%.25l]%n
 
 log4cplus.appender.ROLFILE=log4cplus::RollingFileAppender
-log4cplus.appender.ROLFILE.File=/opt/lofar/var/log/${LOG4CPLUS_LOGFILENAME}.log
+log4cplus.appender.ROLFILE.File=${LOFARROOT}/var/log/${LOG4CPLUS_LOGFILENAME}.log
 log4cplus.appender.ROLFILE.MaxFileSize=10MB
 log4cplus.appender.ROLFILE.MaxBackupIndex=9
 log4cplus.appender.ROLFILE.layout=log4cplus::PatternLayout
diff --git a/SubSystems/Online_Cobalt/CMakeLists.txt b/SubSystems/Online_Cobalt/CMakeLists.txt
index 96a597c242a8a77d75e776abb7a478b8650a916f..8abfcd665f049998c45fd83129652491cf46cbff 100644
--- a/SubSystems/Online_Cobalt/CMakeLists.txt
+++ b/SubSystems/Online_Cobalt/CMakeLists.txt
@@ -3,6 +3,6 @@
 # Online_OutputProc is needed for tests on cbt nodes
 # APLCommon is needed for the `swlevel' script
 # PVSSGateway_Stub and Service_Broker are needed for the tRTmetadataToFile test
-lofar_package(Online_Cobalt DEPENDS Cobalt Online_OutputProc APLCommon PVSSGateway_Stub Service_Broker)
+lofar_package(Online_Cobalt DEPENDS Cobalt Online_OutputProc APLCommon PVSSGateway_Stub Service_Broker Log_Client)
 
 add_subdirectory(test)