diff --git a/.gitattributes b/.gitattributes
index 9c29b3c7314e5b7ac914d7c31683b27616be6b35..1e60a0e2eca371d2d32d11fc2c8b412f6180dac3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -25,9 +25,6 @@
 3rdparty/sourceforge/dtemplatelib/tests/tests.opt -text svneol=unset#unset
 3rdparty/sourceforge/dtemplatelib/tests/tests.res -text svneol=unset#unset
 3rdparty/sourceforge/dtemplatelib/tests/tests_build_sh.opt -text svneol=unset#unset
-CEP/BB/BBS3/package.doc -text
-CEP/BB/MS/package.doc -text
-CEP/BB/package.doc -text
 CEP/CPA/PSS3/CAL/src/TEST.MEP/InitialValues/table.dat -text svneol=unset#unset
 CEP/CPA/PSS3/CAL/src/TEST.MEP/InitialValues/table.f0 -text svneol=unset#unset
 CEP/CPA/PSS3/CAL/src/TEST.MEP/InitialValues/table.f0i -text svneol=unset#unset
@@ -145,35 +142,23 @@ CEP/Demo/TFlopCorrelator/TFC_GUI/startTFC.sh -text svneol=native#application/oct
 CEP/Tools/PerfTest/AsyncTest/src/Simulate.clog -text svneol=unset#unset
 CEP/Tools/PerfTest/InOutTest/src/Simulate.clog -text svneol=unset#unset
 CEP/Tools/PerfTest/P2Perf/src/Simulate.clog -text svneol=unset#unset
-CEP/package.doc -text
 Demo/CEP/TFlopCorrelator/TFC_GUI/make_jar.sh -text svneol=native#application/octet-stream
 Demo/CEP/TFlopCorrelator/TFC_GUI/plot1.png -text
 Demo/CEP/TFlopCorrelator/TFC_GUI/plot2.png -text
 Demo/CEP/TFlopCorrelator/TFC_GUI/plot3.png -text
 Demo/CEP/TFlopCorrelator/TFC_GUI/src/tfc_gui/startTFC.sh -text svneol=native#application/octet-stream
 Demo/CEP/TFlopCorrelator/TFC_GUI/startTFC.sh -text svneol=native#application/octet-stream
-LCS/ACC/ACCbin/package.doc -text
-LCS/ACC/ALC/package.doc -text
-LCS/ACC/APS/package.doc -text
-LCS/ACC/PLC/package.doc -text
-LCS/ACC/package.doc -text
 LCS/AMC/amc_main_classes.png -text
 LCS/AMC/amc_package.png -text
-LCS/AMC/package.doc -text
 LCS/Blob/test/tBlobField.in_be -text svneol=unset#unset
 LCS/Blob/test/tBlobField.in_le -text svneol=unset#unset
 LCS/Blob/test/tBlobStream.in_be -text svneol=unset#unset
 LCS/Blob/test/tBlobStream.in_le -text svneol=unset#unset
-LCS/Common/package.doc -text
 LCS/Common/src/Common-Model.cat -text
 LCS/Common/test/tBlobField.in_be -text svneol=unset#unset
 LCS/Common/test/tBlobField.in_le -text svneol=unset#unset
 LCS/Common/test/tBlobStream.in_be -text svneol=unset#unset
 LCS/Common/test/tBlobStream.in_le -text svneol=unset#unset
-LCS/Math/package.doc -text
-LCS/Transport/package.doc -text
-LCS/databases/PL/package.doc -text
-LCS/package.doc -text
 MAC/APL/APLCommon/Makefile.am -text svneol=native#application/octet-stream
 MAC/APL/APLCommon/bootstrap -text svneol=native#application/octet-stream
 MAC/APL/APLCommon/configure.in -text svneol=native#application/octet-stream
@@ -306,7 +291,6 @@ MAC/APL/PIC/MIS/test/mis.btsw -text svneol=native#application/octet-stream
 MAC/APL/PIC/MIS/test/mis.io -text svneol=native#application/octet-stream
 MAC/APL/PIC/MIS/test/mis.pol -text svneol=native#application/octet-stream
 MAC/APL/PIC/MIS/test/test.sh -text svneol=native#application/octet-stream
-MAC/APL/PIC/RSP_Protocol/package.doc -text
 MAC/APL/PIC/_NodeManager/Makefile.am -text svneol=native#application/octet-stream
 MAC/APL/PIC/_NodeManager/bootstrap -text svneol=native#application/octet-stream
 MAC/APL/PIC/_NodeManager/configure.in -text svneol=native#application/octet-stream
@@ -837,9 +821,6 @@ MAC/_System/lofar30.journal -text svneol=native#application/octet-stream
 MAC/_System/lofar30.sysconf -text svneol=native#application/octet-stream
 MAC/bootstrap -text svneol=native#application/octet-stream
 MAC/lofarconf.in -text svneol=native#application/octet-stream
-SAS/OTB/GUI/package.doc -text
-SAS/OTB/OTBTest/package.doc -text
-SAS/OTB/jOTDB/package.doc -text
 SAS/OTB/jOTDB/src/jOTDB/jOTDBinterface.jar -text svneol=unset#unset
 SAS/OTB/jOTDB/src/jOTDB/jOTDBserver.jar -text svneol=unset#unset
 SDP/SPP/DSP[!!-~]BUILDER/myfilterbank.mdl -text
@@ -860,9 +841,6 @@ SDP/SPP/VHDL/FFT/aukfft_twidrom.tdf -text
 SDP/SPP/VHDL/FFT/aukfft_twidrom_4k.tdf -text
 autoconf_share/lofar_pvss.m4 -text svneol=native#application/octet-stream
 doc/UML/CPA-Packages-Model.mdl -text
-doc/doxygen/pkgdoc-howto.doc -text
-doc/doxygen/quick-guide.doc -text
-/package.doc -text
 /releases.doc -text
 support/tools/BaseSimGUI/images/4.gif -text svneol=unset#unset
 support/tools/BaseSimGUI/images/5.gif -text svneol=unset#unset
diff --git a/CEP/BB/BBS3/package.doc b/CEP/BB/BBS3/package.dox
similarity index 100%
rename from CEP/BB/BBS3/package.doc
rename to CEP/BB/BBS3/package.dox
diff --git a/CEP/BB/MS/package.doc b/CEP/BB/MS/package.dox
similarity index 100%
rename from CEP/BB/MS/package.doc
rename to CEP/BB/MS/package.dox
diff --git a/CEP/BB/package.doc b/CEP/BB/package.dox
similarity index 100%
rename from CEP/BB/package.doc
rename to CEP/BB/package.dox
diff --git a/CEP/package.doc b/CEP/package.dox
similarity index 100%
rename from CEP/package.doc
rename to CEP/package.dox
diff --git a/LCS/ACC/ACCbin/package.doc b/LCS/ACC/ACCbin/package.dox
similarity index 100%
rename from LCS/ACC/ACCbin/package.doc
rename to LCS/ACC/ACCbin/package.dox
diff --git a/LCS/ACC/ALC/package.doc b/LCS/ACC/ALC/package.dox
similarity index 100%
rename from LCS/ACC/ALC/package.doc
rename to LCS/ACC/ALC/package.dox
diff --git a/LCS/ACC/APS/package.doc b/LCS/ACC/APS/package.dox
similarity index 100%
rename from LCS/ACC/APS/package.doc
rename to LCS/ACC/APS/package.dox
diff --git a/LCS/ACC/PLC/package.doc b/LCS/ACC/PLC/package.dox
similarity index 100%
rename from LCS/ACC/PLC/package.doc
rename to LCS/ACC/PLC/package.dox
diff --git a/LCS/ACC/package.doc b/LCS/ACC/package.dox
similarity index 100%
rename from LCS/ACC/package.doc
rename to LCS/ACC/package.dox
diff --git a/LCS/AMC/package.doc b/LCS/AMC/package.dox
similarity index 100%
rename from LCS/AMC/package.doc
rename to LCS/AMC/package.dox
diff --git a/LCS/Common/package.doc b/LCS/Common/package.dox
similarity index 100%
rename from LCS/Common/package.doc
rename to LCS/Common/package.dox
diff --git a/LCS/Math/package.doc b/LCS/Math/package.dox
similarity index 100%
rename from LCS/Math/package.doc
rename to LCS/Math/package.dox
diff --git a/LCS/Transport/package.doc b/LCS/Transport/package.dox
similarity index 100%
rename from LCS/Transport/package.doc
rename to LCS/Transport/package.dox
diff --git a/LCS/databases/PL/package.doc b/LCS/databases/PL/package.dox
similarity index 100%
rename from LCS/databases/PL/package.doc
rename to LCS/databases/PL/package.dox
diff --git a/LCS/package.doc b/LCS/package.dox
similarity index 100%
rename from LCS/package.doc
rename to LCS/package.dox
diff --git a/MAC/APL/PIC/RSP_Protocol/package.doc b/MAC/APL/PIC/RSP_Protocol/package.dox
similarity index 100%
rename from MAC/APL/PIC/RSP_Protocol/package.doc
rename to MAC/APL/PIC/RSP_Protocol/package.dox
diff --git a/MAC/lofarconf.in b/MAC/lofarconf.in
index 0fe8d91855b61943ec1d41ffac54667f2c51153d..8d8bc5b4f978de9f39872bb0ff9cd95084b32668 100644
--- a/MAC/lofarconf.in
+++ b/MAC/lofarconf.in
@@ -1,4 +1,3 @@
 APL
 GCF
-Test
 Tools
diff --git a/SAS/OTB/GUI/package.doc b/SAS/OTB/GUI/package.dox
similarity index 100%
rename from SAS/OTB/GUI/package.doc
rename to SAS/OTB/GUI/package.dox
diff --git a/SAS/OTB/OTBTest/package.doc b/SAS/OTB/OTBTest/package.dox
similarity index 100%
rename from SAS/OTB/OTBTest/package.doc
rename to SAS/OTB/OTBTest/package.dox
diff --git a/SAS/OTB/jOTDB/package.doc b/SAS/OTB/jOTDB/package.dox
similarity index 100%
rename from SAS/OTB/jOTDB/package.doc
rename to SAS/OTB/jOTDB/package.dox
diff --git a/autoconf_share/doxygen.cfg b/autoconf_share/doxygen.cfg
index fb93e0d29eca74aaa9993a26b8630f3097333094..36de8afa6220bb0c3c3aa696e9cb47fd6ecd8c8c 100644
--- a/autoconf_share/doxygen.cfg
+++ b/autoconf_share/doxygen.cfg
@@ -10,7 +10,7 @@ EXTRACT_STATIC		= YES
 MAX_INITIALIZER_LINES	= 0
 WARNINGS		= YES
 WARN_IF_UNDOCUMENTED	= NO
-FILE_PATTERNS		= *.h *.idl *.doc
+FILE_PATTERNS		= *.h *.idl *.dox
 EXCLUDE_SYMLINKS	= YES
 EXCLUDE_PATTERNS	= */build/* */demo/* */test/*
 IMAGE_PATH		= .
diff --git a/doc/doxygen/pkgdoc-howto.doc b/doc/doxygen/pkgdoc-howto.dox
similarity index 100%
rename from doc/doxygen/pkgdoc-howto.doc
rename to doc/doxygen/pkgdoc-howto.dox
diff --git a/doc/doxygen/quick-guide.cfg b/doc/doxygen/quick-guide.cfg
index 9a5693e45ab86b4e06b53ece74d263b108b1398f..dc51fe2db6e7d7d007c00062086dc60da694aad9 100644
--- a/doc/doxygen/quick-guide.cfg
+++ b/doc/doxygen/quick-guide.cfg
@@ -1,4 +1,4 @@
 OUTPUT_DIRECTORY     = .
-INPUT                = quick-guide.doc
+INPUT                = quick-guide.dox
 EXAMPLE_PATH         = examples
 GENERATE_LATEX       = NO
diff --git a/doc/doxygen/quick-guide.doc b/doc/doxygen/quick-guide.dox
similarity index 100%
rename from doc/doxygen/quick-guide.doc
rename to doc/doxygen/quick-guide.dox
diff --git a/package.doc b/package.dox
similarity index 100%
rename from package.doc
rename to package.dox