diff --git a/.gitattributes b/.gitattributes
index 148a5f39f0e4d8846b5529a215edd10b3c6bed7e..d5fb19222efdc5ab8c885adfa0679992394faa05 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3619,6 +3619,9 @@ RTCP/LofarStMan/include/LofarStMan/CMakeLists.txt -text
 RTCP/LofarStMan/src/CMakeLists.txt -text
 RTCP/LofarStMan/src/makeFLAGwritable -text
 RTCP/LofarStMan/test/CMakeLists.txt -text
+RTCP/MetaDataGatherer/CMakeLists.txt -text
+RTCP/MetaDataGatherer/src/CMakeLists.txt -text
+RTCP/MetaDataGatherer/src/FinalMetaDataGatherer.cc -text
 RTCP/RTCPTools/src/cexec-udp-copy -text
 RTCP/RTCPTools/src/tbb-crc-test.cc -text
 RTCP/Run/CMakeLists.txt -text
@@ -3685,7 +3688,6 @@ RTCP/Storage/include/Storage/TBB_StaticMapping.h -text
 RTCP/Storage/include/Storage/TBB_Writer.h -text
 RTCP/Storage/src/ExitOnClosedStdin.cc -text
 RTCP/Storage/src/FastFileStream.cc -text
-RTCP/Storage/src/FinalMetaDataGatherer.cc -text
 RTCP/Storage/src/Format.cc -text
 RTCP/Storage/src/MSWriterCorrelated.cc -text
 RTCP/Storage/src/MSWriterDAL.cc -text
diff --git a/CMake/LofarPackageList.cmake b/CMake/LofarPackageList.cmake
index d383afda24fc4bf1a8e21a17ffeac54a0e80657a..3b7d1abc9d998dda9e6ca6b68c2959948b12b637 100644
--- a/CMake/LofarPackageList.cmake
+++ b/CMake/LofarPackageList.cmake
@@ -108,6 +108,7 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
   set(Storage_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Storage)
   set(Run_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/Run)
   set(LofarStMan_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/LofarStMan)
+  set(MetaDataGatherer_SOURCE_DIR ${CMAKE_SOURCE_DIR}/RTCP/MetaDataGatherer)
   set(OTDB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTDB)
   set(OTB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB)
   set(Beaminfo_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/Beaminfo)
diff --git a/RTCP/CMakeLists.txt b/RTCP/CMakeLists.txt
index 87988843b5776ec8db311cac902fd1bf20078674..8e2e58a08747b8d7b636a982c74e0962e6f740db 100644
--- a/RTCP/CMakeLists.txt
+++ b/RTCP/CMakeLists.txt
@@ -7,3 +7,4 @@ lofar_add_package(IONProc)   # BlueGene: I/O Node Processing applications
 lofar_add_package(Storage)   # Stores correlator output in MeasurmentSets
 lofar_add_package(Run)       # Run scripts to start RTCP components
 lofar_add_package(LofarStMan)# Storage Manager for the main table of a LOFAR MS
+lofar_add_package(MetaDataGatherer)# Pulls in meta data from OTDB etc
diff --git a/RTCP/MetaDataGatherer/CMakeLists.txt b/RTCP/MetaDataGatherer/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..177ce0e4793522c2e3bca9e3ad8ad3b81ab172fa
--- /dev/null
+++ b/RTCP/MetaDataGatherer/CMakeLists.txt
@@ -0,0 +1,8 @@
+# $Id: CMakeLists.txt 22563 2012-10-30 18:50:15Z mol $
+
+lofar_package(MetaDataGatherer 1.0 DEPENDS Common Stream OTDB Interface Storage)
+
+include(LofarFindPackage)
+lofar_find_package(Casacore COMPONENTS casa ms tables REQUIRED)
+
+add_subdirectory(src)
diff --git a/RTCP/MetaDataGatherer/src/CMakeLists.txt b/RTCP/MetaDataGatherer/src/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..af98d61a4b3ef82e9bb4d399c475d79e9ae315f9
--- /dev/null
+++ b/RTCP/MetaDataGatherer/src/CMakeLists.txt
@@ -0,0 +1,12 @@
+# $Id: CMakeLists.txt 22530 2012-10-26 13:11:29Z mol $
+
+include(LofarPackageVersion)
+
+lofar_add_library(metadatagatherer 
+  Package__Version.cc)
+
+install(FILES
+  FinalMetaDataGatherer.log_prop
+  DESTINATION etc)
+
+lofar_add_bin_program(FinalMetaDataGatherer FinalMetaDataGatherer.cc)
diff --git a/RTCP/Storage/src/FinalMetaDataGatherer.cc b/RTCP/MetaDataGatherer/src/FinalMetaDataGatherer.cc
similarity index 99%
rename from RTCP/Storage/src/FinalMetaDataGatherer.cc
rename to RTCP/MetaDataGatherer/src/FinalMetaDataGatherer.cc
index 777f206408952f07c9f1e24dab45bb48e7c74947..c23d9adf861e79ac20a383034c6fb02535717ab0 100644
--- a/RTCP/Storage/src/FinalMetaDataGatherer.cc
+++ b/RTCP/MetaDataGatherer/src/FinalMetaDataGatherer.cc
@@ -70,7 +70,7 @@ MVEpoch toCasaTime (const string& time)
   ASSERT(!time.empty());
 
   // e.g. 2011-Mar-19 21:17:06.514000
-  Double casaTime;                  // casacore MVEpoch time to be returned
+  Double casaTime = 0.0;            // casacore MVEpoch time to be returned
   Quantity result(casaTime, "s");   // set quantity unit to seconds
   MVTime::read(result, time);
   return result;
diff --git a/RTCP/Storage/src/FinalMetaDataGatherer.log_prop b/RTCP/MetaDataGatherer/src/FinalMetaDataGatherer.log_prop
similarity index 100%
rename from RTCP/Storage/src/FinalMetaDataGatherer.log_prop
rename to RTCP/MetaDataGatherer/src/FinalMetaDataGatherer.log_prop
diff --git a/RTCP/Storage/CMakeLists.txt b/RTCP/Storage/CMakeLists.txt
index 72305e02b71dacb8ebee34a39384825188a2b3d3..1ec905111dc543c0ea6458f7d8fcfb1999dfab4d 100644
--- a/RTCP/Storage/CMakeLists.txt
+++ b/RTCP/Storage/CMakeLists.txt
@@ -1,6 +1,6 @@
 # $Id$
 
-lofar_package(Storage 1.0 DEPENDS Common ApplCommon Interface MSLofar LofarStMan OTDB)
+lofar_package(Storage 1.0 DEPENDS Common ApplCommon Stream Interface MSLofar LofarStMan)
 
 include(LofarFindPackage)
 lofar_find_package(Casacore COMPONENTS casa ms tables REQUIRED)
diff --git a/RTCP/Storage/src/CMakeLists.txt b/RTCP/Storage/src/CMakeLists.txt
index a0de7ff6740897362e39d0971413050d976e2161..8a4125d86d0740e1f07cad1740e3698ba7b7d4f8 100644
--- a/RTCP/Storage/src/CMakeLists.txt
+++ b/RTCP/Storage/src/CMakeLists.txt
@@ -25,13 +25,11 @@ install(PROGRAMS
   DESTINATION bin)
 
 install(FILES
-  FinalMetaDataGatherer.log_prop
   Storage_main.log_prop
   TBB_Writer_main.log_prop
   DESTINATION etc)
 
 lofar_add_bin_program(Storage_main Storage_main.cc)
-lofar_add_bin_program(FinalMetaDataGatherer FinalMetaDataGatherer.cc)
 lofar_add_bin_program(createHeaders createHeaders.cc)
 lofar_add_bin_program(plotMS plotMS.cc)
 lofar_add_bin_program(versionstorage versionstorage.cc)