diff --git a/MAC/APL/PAC/_StationStartDaemon/configure.in b/MAC/APL/PAC/_StationStartDaemon/configure.in
index faa79f80461b99a729259643d402c4d2fb507d3c..f67a14867e35f92aa6571c522c44c543572e5aa6 100644
--- a/MAC/APL/PAC/_StationStartDaemon/configure.in
+++ b/MAC/APL/PAC/_StationStartDaemon/configure.in
@@ -60,16 +60,16 @@ lofar_COMPILETOOLS
 lofar_LOG4CPLUS
 lofar_PVSS(1)
 lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-5_2rc1, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-5_2rc1, 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-5_2rc1, 1, GCF/PAL/GCF_PVSSInfo.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_0rc1, 1, APLCommon/APL_Defines.h,,)
-lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-APL-3_0rc1, 1, RSP_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/BeamServer, absdevel, MAC-APL-3_0rc1, 1, BS_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/Calibration, caldevel, MAC-APL-3_0rc1, 1, CAL_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/StationOperations, stationoperations, MAC-APL-3_0rc1, 1, StationOperations/StationOperations.h,,)
-lofar_INTERNAL(MAC/APL/PAC/StationReceptorGroup, stationreceptorgroup, MAC-APL-3_0rc1, 1, StationReceptorGroup/StationReceptorGroup.h,,)
-lofar_INTERNAL(MAC/APL/PAC/VirtualTelescope, virtualtelescope, MAC-APL-3_0rc1, 1, VirtualTelescope/VirtualTelescope.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_0, 1, APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-APL-3_0, 1, RSP_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/PAC/BeamServer, absdevel, MAC-APL-3_0, 1, BS_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/PAC/Calibration, caldevel, MAC-APL-3_0, 1, CAL_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/PAC/StationOperations, stationoperations, MAC-APL-3_0, 1, StationOperations/StationOperations.h,,)
+lofar_INTERNAL(MAC/APL/PAC/StationReceptorGroup, stationreceptorgroup, MAC-APL-3_0, 1, StationReceptorGroup/StationReceptorGroup.h,,)
+lofar_INTERNAL(MAC/APL/PAC/VirtualTelescope, virtualtelescope, MAC-APL-3_0, 1, VirtualTelescope/VirtualTelescope.h,,)
 
 dnl
 dnl Output Makefiles
diff --git a/MAC/APL/PAC/_VirtualTelescope/configure.in b/MAC/APL/PAC/_VirtualTelescope/configure.in
index a570186c4317cfb5730e9909206b276e42314773..cff3cf2cd6fc6c70b6cae915e1dc45365d0e4eea 100644
--- a/MAC/APL/PAC/_VirtualTelescope/configure.in
+++ b/MAC/APL/PAC/_VirtualTelescope/configure.in
@@ -58,13 +58,13 @@ lofar_COMPILETOOLS
 lofar_PVSS(1)
 lofar_LOG4CPLUS
 lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-5_2rc1, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-5_2rc1, 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-5_2rc1, 1, GCF/PAL/GCF_PVSSInfo.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_0rc1, 1, APLCommon/APL_Defines.h,,)
-lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-APL-3_0rc1, 1, RSP_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/RSPDriver, epa, MAC-APL-3_0rc1, 1, EPA_Protocol.ph,,)
-lofar_INTERNAL(MAC/APL/PAC/BeamServer, absdevel, MAC-APL-3_0rc1, 1, BS_Protocol.ph,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_0, 1, APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/APL/PAC/RSPDriver, rsp, MAC-APL-3_0, 1, RSP_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/PAC/RSPDriver, epa, MAC-APL-3_0, 1, EPA_Protocol.ph,,)
+lofar_INTERNAL(MAC/APL/PAC/BeamServer, absdevel, MAC-APL-3_0, 1, BS_Protocol.ph,,)
 
 dnl
 dnl Output Makefiles
diff --git a/MAC/APL/_GSO/MACScheduler/configure.in b/MAC/APL/_GSO/MACScheduler/configure.in
index be77164dcce905be48dc90708b0a47e06692f39c..873f4aee2ecd6cec35154693ccbc9f1da0b0e1b6 100644
--- a/MAC/APL/_GSO/MACScheduler/configure.in
+++ b/MAC/APL/_GSO/MACScheduler/configure.in
@@ -61,10 +61,10 @@ lofar_LOG4CPLUS
 lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
 lofar_INTERNAL(LCS/ACC/APS, aps, HEAD, 1, APS/ParameterSet.h,,)
 lofar_INTERNAL(SAS/OTDB, otdb, HEAD, 1, OTDB/OTDBconnection.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-5_2rc1, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-5_2rc1, 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-5_2rc1, 1, GCF/PAL/GCF_PVSSInfo.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_0rc1, 1, APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_0, 1, APLCommon/APL_Defines.h,,)
 
 dnl
 dnl Output Makefiles
diff --git a/MAC/APL/_VIC/VirtualInstrument/configure.in b/MAC/APL/_VIC/VirtualInstrument/configure.in
index 5e4f0a99249cb9bb2768ea8516267dd42e7f5e01..6488422bf75b6fd373f8be9dee5632c1a6a876d7 100644
--- a/MAC/APL/_VIC/VirtualInstrument/configure.in
+++ b/MAC/APL/_VIC/VirtualInstrument/configure.in
@@ -59,12 +59,12 @@ lofar_COMPILETOOLS
 lofar_PVSS(1)
 lofar_LOG4CPLUS
 lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-5_2rc1, 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-5_2rc1, 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-5_2rc1, 1, GCF/PAL/GCF_PVSSInfo.h,,)
-lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_0rc1, 1, APLCommon/APL_Defines.h,,)
-lofar_INTERNAL(MAC/APL/VIC/ArrayOperations, arrayoperations, MAC-APL-3_0rc1, 1, ArrayOperations/ArrayOperations.h,,)
-lofar_INTERNAL(MAC/APL/VIC/ArrayReceptorGroup, arrayreceptorgroup, MAC-APL-3_0rc1, 1, ArrayReceptorGroup/ArrayReceptorGroup.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_0, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_0, 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_0, 1, GCF/PAL/GCF_PVSSInfo.h,,)
+lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, MAC-APL-3_0, 1, APLCommon/APL_Defines.h,,)
+lofar_INTERNAL(MAC/APL/VIC/ArrayOperations, arrayoperations, MAC-APL-3_0, 1, ArrayOperations/ArrayOperations.h,,)
+lofar_INTERNAL(MAC/APL/VIC/ArrayReceptorGroup, arrayreceptorgroup, MAC-APL-3_0, 1, ArrayReceptorGroup/ArrayReceptorGroup.h,,)
 
 dnl
 dnl Output Makefiles