diff --git a/MAC/GCF/LogSys/configure.in b/MAC/GCF/LogSys/configure.in
index 658b9188c6f6c786ba4a7762304c4764ce81fa1f..13acfe19de9639109160ff17f13e40158771e6d0 100644
--- a/MAC/GCF/LogSys/configure.in
+++ b/MAC/GCF/LogSys/configure.in
@@ -38,9 +38,9 @@ dnl
 lofar_GENERAL
 lofar_PVSS
 lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.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/GCF/GCFCommon, gcfcommon, MAC-GCF-6_1rc2, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_1rc2, 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, gcfpal, MAC-GCF-6_1rc2, 1, GCF/PAL/GCF_PVSSInfo.h,,)
 lofar_INTERNAL(SAS/OTDB, otdb, HEAD, 1, OTDB/OTDBconnection.h,,)
 lofar_INTERNAL(LCS/ACC/APS, aps, LCS-ACC-2_0, 1, APS/ParameterSet.h,,)
 
diff --git a/MAC/GCF/Protocols/configure.in b/MAC/GCF/Protocols/configure.in
index eaec4bae18f4f1399e69d2814b1f899ec12949cc..5197832b58c6abffcc08a0743ab5e48f693552e2 100644
--- a/MAC/GCF/Protocols/configure.in
+++ b/MAC/GCF/Protocols/configure.in
@@ -39,8 +39,8 @@ dnl
 lofar_GENERAL
 lofar_INTERNAL(LCS/Common, Common, LCS-Common-2_3, 1,Common/LofarTypes.h,,)
 lofar_INTERNAL(LCS/Transport, transport, LCS-Transport-2_1, 1, Transport/DataHolder.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_Event.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_1rc2, 1,GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, GCFTM, MAC-GCF-6_1rc2, 1, GCF/TM/GCF_Event.h,,)
 
 dnl
 dnl Output Makefiles
diff --git a/MAC/GCF/TM/configure.in b/MAC/GCF/TM/configure.in
index eec7b22ecdb7e1ee93fd25916551d5a78e6b7783..bacc4b14f248ddb3d189c1c016ad5943226c0720 100644
--- a/MAC/GCF/TM/configure.in
+++ b/MAC/GCF/TM/configure.in
@@ -37,7 +37,7 @@ dnl Check for LOFAR specific things
 dnl
 lofar_GENERAL
 lofar_INTERNAL(LCS/Common, Common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_1, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, MAC-GCF-6_1rc2, 1, GCF/GCF_Defines.h,,)
 
 dnl
 dnl Output Makefiles
diff --git a/MAC/GCF/_PAL/configure.in b/MAC/GCF/_PAL/configure.in
index d874899e723274d7f70c470ad131069e0ce7d4ca..f5110ecb3508fb31dd8f83d1d705ad4588228a1a 100644
--- a/MAC/GCF/_PAL/configure.in
+++ b/MAC/GCF/_PAL/configure.in
@@ -39,11 +39,11 @@ lofar_GENERAL
 lofar_PVSS(1)
 lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
 lofar_INTERNAL(LCS/Transport, transport, LCS-Transport-2_1, 1, Transport/DataHolder.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/Protocols, gcfpirtcprot, MAC-GCF-6_0, 1, GCF/Protocols/PI_Protocol.ph,,)
-lofar_INTERNAL(MAC/GCF/Protocols, gcfpicepprot, MAC-GCF-6_0, 1, GCF/Protocols/DH_PIProtocol.h,,)
-lofar_INTERNAL(MAC/GCF/Protocols, gcfpaprot, MAC-GCF-6_0, 1, GCF/Protocols/PA_Protocol.ph,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_1rc2, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_1rc2, 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/Protocols, gcfpirtcprot, MAC-GCF-6_1rc2, 1, GCF/Protocols/PI_Protocol.ph,,)
+lofar_INTERNAL(MAC/GCF/Protocols, gcfpicepprot, MAC-GCF-6_1rc2, 1, GCF/Protocols/DH_PIProtocol.h,,)
+lofar_INTERNAL(MAC/GCF/Protocols, gcfpaprot, MAC-GCF-6_1rc2, 1, GCF/Protocols/PA_Protocol.ph,,)
 
 dnl
 dnl Output Makefiles
diff --git a/MAC/GCF/_PALlight/configure.in b/MAC/GCF/_PALlight/configure.in
index 77d9e52a436214adfe277227f4f148e005f78f26..fa39b99f5380cb32d68bf6783a8f7ea368fad661 100644
--- a/MAC/GCF/_PALlight/configure.in
+++ b/MAC/GCF/_PALlight/configure.in
@@ -39,10 +39,10 @@ dnl
 lofar_GENERAL
 lofar_INTERNAL(LCS/Common, common, LCS-Common-2_3, 1, Common/LofarTypes.h,,)
 lofar_INTERNAL(LCS/Transport, transport, LCS-Transport-2_1, 1, Transport/DataHolder.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/Protocols, gcfpirtcprot, MAC-GCF-6_0, 1, GCF/Protocols/PI_Protocol.ph,,)
-lofar_INTERNAL(MAC/GCF/Protocols, gcfpicepprot, MAC-GCF-6_0, 1, GCF/Protocols/DH_PIProtocol.h,,)
+lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, MAC-GCF-6_1rc2, 1, GCF/GCF_Defines.h,,)
+lofar_INTERNAL(MAC/GCF/TM, gcftm, MAC-GCF-6_1rc2, 1, GCF/TM/GCF_Task.h,,)
+lofar_INTERNAL(MAC/GCF/Protocols, gcfpirtcprot, MAC-GCF-6_1rc2, 1, GCF/Protocols/PI_Protocol.ph,,)
+lofar_INTERNAL(MAC/GCF/Protocols, gcfpicepprot, MAC-GCF-6_1rc2, 1, GCF/Protocols/DH_PIProtocol.h,,)
 
 dnl
 dnl Output Makefiles
diff --git a/MAC/Test/GCF/CEP/configure.in b/MAC/Test/GCF/CEP/configure.in
index 56620630376f65bc4f8e6fd1bd757fdf6f796949..48e3954c7340c6380c2698f20e66a5cfe50efa8a 100644
--- a/MAC/Test/GCF/CEP/configure.in
+++ b/MAC/Test/GCF/CEP/configure.in
@@ -52,7 +52,7 @@ dnl Check for LOFAR specific things
 dnl
 lofar_GENERAL
 #lofar_QT
-lofar_INTERNAL(MAC/GCF/PALlight, gcfceppallight, MAC-GCF-6_0, 1, GCF/PALlight/CEPProperty.h,,)
+lofar_INTERNAL(MAC/GCF/PALlight, gcfceppallight, MAC-GCF-6_1rc2, 1, GCF/PALlight/CEPProperty.h,,)
                        
 dnl
 dnl Output Makefiles
diff --git a/MAC/Test/GCF/MAC/configure.in b/MAC/Test/GCF/MAC/configure.in
index c5be5e3621ec27d751efd1a932dea00daa6b9056..390f9e5cf395025664c5f051fd040d7e7e6d6b53 100644
--- a/MAC/Test/GCF/MAC/configure.in
+++ b/MAC/Test/GCF/MAC/configure.in
@@ -53,9 +53,9 @@ dnl
 lofar_GENERAL
 #lofar_QT
 lofar_PVSS(1)
-lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_0, 1, GCF/PAL/GCF_Property.h,,)
-lofar_INTERNAL(MAC/GCF/PALlight, GCFPALlight, MAC-GCF-6_0, 1, GCF/PALlight/GCF_RTMyProperty.h,,)
-lofar_INTERNAL(MAC/GCF/LogSys, GCFKvlc, MAC-GCF-6_0, 1, GCF/LogSys/GCF_KeyValueLogger.h,,)
+lofar_INTERNAL(MAC/GCF/PAL, GCFPAL, MAC-GCF-6_1rc2, 1, GCF/PAL/GCF_Property.h,,)
+lofar_INTERNAL(MAC/GCF/PALlight, GCFPALlight, MAC-GCF-6_1rc2, 1, GCF/PALlight/GCF_RTMyProperty.h,,)
+lofar_INTERNAL(MAC/GCF/LogSys, GCFKvlc, MAC-GCF-6_1rc2, 1, GCF/LogSys/GCF_KeyValueLogger.h,,)
 lofar_PACKAGE(MAC/Test/Suite)
 lofar_PACKAGE(MAC/Test/GCF/RTC)
 
diff --git a/MAC/Test/GCF/RTC/configure.in b/MAC/Test/GCF/RTC/configure.in
index 18652175e6f316da1a4bdf795c2013b591178e36..d58a80551326dc5bb18649890adeccab53dfe353 100644
--- a/MAC/Test/GCF/RTC/configure.in
+++ b/MAC/Test/GCF/RTC/configure.in
@@ -52,7 +52,7 @@ dnl Check for LOFAR specific things
 dnl
 lofar_GENERAL
 #lofar_QT
-lofar_INTERNAL(MAC/GCF/PALlight, GCFPALlight, MAC-GCF-6_0, 1, GCF/PALlight/GCF_RTMyProperty.h,,)
+lofar_INTERNAL(MAC/GCF/PALlight, GCFPALlight, MAC-GCF-6_1rc2, 1, GCF/PALlight/GCF_RTMyProperty.h,,)
                        
 dnl
 dnl Output Makefiles