diff --git a/MAC/APL/PIC/lofarconf.in b/MAC/APL/PIC/lofarconf.in
index 5c14c9de58ee2206459360b85b71078e0a76e801..ec06bbcf3d9dd40454c465be87ac2c8f529abded 100644
--- a/MAC/APL/PIC/lofarconf.in
+++ b/MAC/APL/PIC/lofarconf.in
@@ -1,8 +1,5 @@
-RSP_Protocol	# package to use when you want to communicate with the RSPDriver
-RSPDriver	# the RSPDriver implementation
-rsuctl		# remote update script
-
-# Packages below are not needed for MAC-RTC-6_1 release
-#RSPCtlFE	# a frontend for the rspctl program to interface with PVSS
-#RegisterAccess
-#MIS
+RSP_Protocol
+RSPDriver
+TBB_Protocol
+TBBDriver
+rsuctl
diff --git a/MAC/APL/lofarconf.in b/MAC/APL/lofarconf.in
index 6ff6a865340561dbfc44bcf3863d0f19ca350bb8..aaff9dc1b8078414a3784516858344763d1cb5dd 100644
--- a/MAC/APL/lofarconf.in
+++ b/MAC/APL/lofarconf.in
@@ -1,9 +1,12 @@
 APLCommon
-RTCCommon
+APLProtocol
 CEPCU
 CUDaemons
+CURTDBDaemons
 MainCU
+PAC
+PIC
+RTCCommon
+RTDBCommon
 StationCU
 TestCtlr
-PIC
-PAC
diff --git a/MAC/GCF/lofarconf.in b/MAC/GCF/lofarconf.in
index a77c0badea35b3c7d3508ad2ade2129468dd430a..14ff8112e694f848541c7185c75aa534b3ca97bb 100644
--- a/MAC/GCF/lofarconf.in
+++ b/MAC/GCF/lofarconf.in
@@ -1,6 +1,4 @@
-GCFCommon #-vMAC-GCF-6_2
-TM #-vMAC-GCF-6_2
-Protocols #-vMAC-GCF-6_2
-PAL #-vMAC-GCF-6_2
-LogSys #-vMAC-GCF-6_2
-PALlight #-vMAC-GCF-6_2
+GCFCommon
+PVSS
+RTDB
+TM
diff --git a/MAC/lofarconf.in b/MAC/lofarconf.in
index 0fe8d91855b61943ec1d41ffac54667f2c51153d..0cd8b1db075ed3fe533ce41af34df8aacba19528 100644
--- a/MAC/lofarconf.in
+++ b/MAC/lofarconf.in
@@ -1,4 +1,2 @@
 APL
 GCF
-Test
-Tools