diff --git a/.gitattributes b/.gitattributes
index cea71302f862665f7ce62bce90a461e9b68a7aab..aefc0d6b86549aacae8c66b833cb1b7d63723e79 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1160,25 +1160,19 @@ MAC/APL/PAC/Beam_Server/test/weights.dat -text svneol=unset#unset
 MAC/APL/PAC/Cal_Server/src/CS010C_HALF_positions.dat -text
 MAC/APL/PAC/Cal_Server/src/CS010C_positions.dat -text
 MAC/APL/PAC/IBS_Protocol/src/IBS_Protocol.prot -text
-MAC/APL/PAC/ICAL_Protocol/CMakeLists.txt -text
 MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/AntennaGains.h -text
-MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/CMakeLists.txt -text
 MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SpectralWindow.h -text
 MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SubArray.h -text
 MAC/APL/PAC/ICAL_Protocol/src/AntennaGains.cc -text
-MAC/APL/PAC/ICAL_Protocol/src/CMakeLists.txt -text
 MAC/APL/PAC/ICAL_Protocol/src/ICAL_Protocol.prot -text
 MAC/APL/PAC/ICAL_Protocol/src/SpectralWindow.cc -text
 MAC/APL/PAC/ICAL_Protocol/src/SubArray.cc -text
-MAC/APL/PAC/ITRFBeamServer/CMakeLists.txt -text
-MAC/APL/PAC/ITRFBeamServer/src/CMakeLists.txt -text
 MAC/APL/PAC/ITRFBeamServer/src/StatCal.cc -text
 MAC/APL/PAC/ITRFBeamServer/src/StatCal.h -text
 MAC/APL/PAC/ITRFBeamServer/src/iBeamServer.conf.in -text
 MAC/APL/PAC/ITRFBeamServer/src/ibeamctl.conf.in -text
 MAC/APL/PAC/ITRFBeamServer/test/AntennaField.conf -text
 MAC/APL/PAC/ITRFBeamServer/test/AntennaSets.conf -text
-MAC/APL/PAC/ITRFBeamServer/test/CMakeLists.txt -text
 MAC/APL/PAC/ITRFBeamServer/test/HBADelays.conf -text
 MAC/APL/PAC/ITRFBeamServer/test/iHBADeltas.conf -text
 MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc -text
@@ -1187,14 +1181,12 @@ MAC/APL/PAC/ITRFBeamServer/test/tIdealStartTime.cc -text
 MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc -text
 MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.log_prop -text
 MAC/APL/PAC/ITRFBeamServer/test/tStatCal.cc -text
-MAC/APL/PAC/ITRFCalServer/CMakeLists.txt -text
 MAC/APL/PAC/ITRFCalServer/src/ACC.cc -text
 MAC/APL/PAC/ITRFCalServer/src/ACC.h -text
 MAC/APL/PAC/ITRFCalServer/src/ACCcache.cc -text
 MAC/APL/PAC/ITRFCalServer/src/ACCcache.h -text
 MAC/APL/PAC/ITRFCalServer/src/ACMProxy.cc -text
 MAC/APL/PAC/ITRFCalServer/src/ACMProxy.h -text
-MAC/APL/PAC/ITRFCalServer/src/CMakeLists.txt -text
 MAC/APL/PAC/ITRFCalServer/src/CalServer.cc -text
 MAC/APL/PAC/ITRFCalServer/src/CalServer.h -text
 MAC/APL/PAC/ITRFCalServer/src/CalServerMain.cc -text
@@ -1213,7 +1205,6 @@ MAC/APL/PAC/ITRFCalServer/src/calinfo.cc -text
 MAC/APL/PAC/ITRFCalServer/src/calinfo.h -text
 MAC/APL/PAC/ITRFCalServer/src/genacc.cc -text
 MAC/APL/PAC/ITRFCalServer/src/iCalServer.conf.in -text
-MAC/APL/PAC/ITRFCalServer/test/CMakeLists.txt -text
 MAC/APL/PAC/ITRFCalServer/test/CalTest.cc -text
 MAC/APL/PAC/ITRFCalServer/test/CalTest.conf.in -text
 MAC/APL/PAC/ITRFCalServer/test/CalTest.h -text
@@ -1221,11 +1212,8 @@ MAC/APL/PAC/ITRFCalServer/test/tCalServer.cc -text
 MAC/APL/PAC/ITRFCalServer/test/tCalServer.h -text
 MAC/APL/PAC/ITRFCalServer/test/tSubArrayMgr.cc -text
 MAC/APL/PAC/ITRFCalServer/test/tSubArrayMgr.log_prop -text
-MAC/APL/PAC/LBA_Calibration/CMakeLists.txt -text
-MAC/APL/PAC/LBA_Calibration/src/CMakeLists.txt -text
 MAC/APL/PAC/LBA_Calibration/src/statcal.m -text
 MAC/APL/PAC/LBA_Calibration/test/20080118_083229_acc_512x96x96.dat.gz -text svneol=unset#application/x-gzip
-MAC/APL/PAC/LBA_Calibration/test/CMakeLists.txt -text
 MAC/APL/PAC/LBA_Calibration/test/antpos.dat -text
 MAC/APL/PAC/LBA_Calibration/test/calresult.dat -text
 MAC/APL/PAC/LBA_Calibration/test/flags.dat -text
diff --git a/MAC/APL/PAC/ICAL_Protocol/CMakeLists.txt b/MAC/APL/PAC/ICAL_Protocol/CMakeLists.txt
index 07564887f32413dc40d7f4357884ff27bce22727..7acebcf5d5e54b414b2953c46d7c4c5ff9c6d49d 100644
--- a/MAC/APL/PAC/ICAL_Protocol/CMakeLists.txt
+++ b/MAC/APL/PAC/ICAL_Protocol/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 14280 2009-10-16 13:48:46Z loose $
+# $Id$
 
 lofar_package(ICAL_Protocol 1.0 DEPENDS Common MACIO RTCCommon APLCommon RSP_Protocol)
 
diff --git a/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/CMakeLists.txt b/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/CMakeLists.txt
index 63ffa0c466e873e8a793cee5a74722bfee1e9a57..b9e2b2d55260a9ef12293052ea428601a11a3dd9 100644
--- a/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/CMakeLists.txt
+++ b/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 14860 2010-01-22 11:12:13Z loose $
+# $Id$
 
 # List of header files that will be installed.
 set(inst_HEADERS
diff --git a/MAC/APL/PAC/ICAL_Protocol/src/CMakeLists.txt b/MAC/APL/PAC/ICAL_Protocol/src/CMakeLists.txt
index f4ea180a4d96c429f292284341f64cb40da3a4e6..ccb49b9a9bc5bdc098e72022e10e6f0d20ecdae6 100644
--- a/MAC/APL/PAC/ICAL_Protocol/src/CMakeLists.txt
+++ b/MAC/APL/PAC/ICAL_Protocol/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 14273 2009-10-16 10:08:29Z loose $
+# $Id$
 
 include(LofarPackageVersion)
 
diff --git a/MAC/APL/PAC/ITRFBeamServer/CMakeLists.txt b/MAC/APL/PAC/ITRFBeamServer/CMakeLists.txt
index 80b56c4327f26beadcc4a27a7fd3fb2cebcf38ad..7f9cdcb14f2f044a565de215ba50307703e2ecaa 100644
--- a/MAC/APL/PAC/ITRFBeamServer/CMakeLists.txt
+++ b/MAC/APL/PAC/ITRFBeamServer/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 14697 2009-12-16 15:06:53Z loose $
+# $Id$
 
 # Do not split the following line, otherwise makeversion will fail!
 lofar_package(ITRFBeamServer 1.0 DEPENDS Common ApplCommon MACIO GCFTM APLCommon RTCCommon RSP_Protocol IBS_Protocol CAL_Protocol CASATools)
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/CMakeLists.txt b/MAC/APL/PAC/ITRFBeamServer/src/CMakeLists.txt
index bf2160ccaddb9bddbfffe0304576460c844bd285..3175e7bb8ed7cc81e1cd9b9fc51d68fc42a39269 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/CMakeLists.txt
+++ b/MAC/APL/PAC/ITRFBeamServer/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 14273 2009-10-16 10:08:29Z loose $
+# $Id$
 
 include(LofarPackageVersion)
 
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/CMakeLists.txt b/MAC/APL/PAC/ITRFBeamServer/test/CMakeLists.txt
index 84f1818587f2ce8ebe0437ccb2f473e23e15ee05..3980c06f5731f4d33ed4bc2e5018efff2ac651a1 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/CMakeLists.txt
+++ b/MAC/APL/PAC/ITRFBeamServer/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 14273 2009-10-16 10:08:29Z loose $
+# $Id$
 
 include(LofarCTest)
 
diff --git a/MAC/APL/PAC/ITRFCalServer/CMakeLists.txt b/MAC/APL/PAC/ITRFCalServer/CMakeLists.txt
index 6974cfe280adb6c5a3d5ce8d66bed37cf65fecf6..524cf547676f9bdb16ea51342bd0dc9783c9d981 100644
--- a/MAC/APL/PAC/ITRFCalServer/CMakeLists.txt
+++ b/MAC/APL/PAC/ITRFCalServer/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 14280 2009-10-16 13:48:46Z loose $
+# $Id$
 
 # Do not split the following line, otherwise makeversion will fail!
 lofar_package(ITRFCalServer 1.0 DEPENDS Common ApplCommon MACIO GCFTM APLCommon RTCCommon RSP_Protocol ICAL_Protocol LBA_Calibration)
diff --git a/MAC/APL/PAC/ITRFCalServer/src/CMakeLists.txt b/MAC/APL/PAC/ITRFCalServer/src/CMakeLists.txt
index 778c25f914ee7a0ac5177374f0909968e97a912b..580145309acdeb6edde7d1a1c170ace02752380a 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/CMakeLists.txt
+++ b/MAC/APL/PAC/ITRFCalServer/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 14273 2009-10-16 10:08:29Z loose $
+# $Id$
 
 include(LofarPackageVersion)
 
diff --git a/MAC/APL/PAC/ITRFCalServer/test/CMakeLists.txt b/MAC/APL/PAC/ITRFCalServer/test/CMakeLists.txt
index 4858226125016835da682fbeadda386fac6ae144..24e5ecea7a47d5f0bf951872356ce461b3d57127 100644
--- a/MAC/APL/PAC/ITRFCalServer/test/CMakeLists.txt
+++ b/MAC/APL/PAC/ITRFCalServer/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 14273 2009-10-16 10:08:29Z loose $
+# $Id$
 
 include(LofarCTest)
 
diff --git a/MAC/APL/PAC/LBA_Calibration/CMakeLists.txt b/MAC/APL/PAC/LBA_Calibration/CMakeLists.txt
index 08d7c6fe8eca49b501a7158c7ddc8baa1377b79c..2bc6a13d3c8caf8e71928daa58148ac2f17979e9 100644
--- a/MAC/APL/PAC/LBA_Calibration/CMakeLists.txt
+++ b/MAC/APL/PAC/LBA_Calibration/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 14280 2009-10-16 13:48:46Z loose $
+# $Id$
 
 lofar_package(LBA_Calibration 1.0 DEPENDS Common)
 
diff --git a/MAC/APL/PAC/LBA_Calibration/src/CMakeLists.txt b/MAC/APL/PAC/LBA_Calibration/src/CMakeLists.txt
index 7e96f937f94771fb7334c0519dac5dbbb7c7c083..aca2b31d51818a34408ce69de412feb1869426a6 100644
--- a/MAC/APL/PAC/LBA_Calibration/src/CMakeLists.txt
+++ b/MAC/APL/PAC/LBA_Calibration/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 15028 2010-02-19 09:18:56Z donker $
+# $Id$
 
 include(LofarMatlab)
 include(LofarPackageVersion)
diff --git a/MAC/APL/PAC/LBA_Calibration/test/CMakeLists.txt b/MAC/APL/PAC/LBA_Calibration/test/CMakeLists.txt
index 5502e17ab2ecce8bbf1b1768044370531379eeea..943d591f13b048842b4272cdb47e17b1ae2ee6f7 100644
--- a/MAC/APL/PAC/LBA_Calibration/test/CMakeLists.txt
+++ b/MAC/APL/PAC/LBA_Calibration/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 14466 2009-11-17 08:58:28Z schoenmakers $
+# $Id$
 
 include(LofarCTest)