diff --git a/.gitattributes b/.gitattributes
index 6f00895ed23a60b7fd8a0c800fc7b5967ea13b56..cf5906215015772cd46c5c8363659a83b8ba9ac2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2460,7 +2460,7 @@ MAC/APL/CEPCU/src/OnlineControl/forkexec.cc -text
 MAC/APL/CEPCU/src/OnlineControl/forkexec.h -text
 MAC/APL/CEPCU/src/OnlineControl/tPVSSMapping.cc -text
 MAC/APL/CEPCU/src/PythonControl/PythonControl.conf -text
-MAC/APL/CEPCU/src/PythonControl/tMDparser.cc -text
+MAC/APL/CEPCU/src/PythonControl/uploadMetadata.cc -text
 MAC/APL/CR_Protocol/CMakeLists.txt -text
 MAC/APL/CR_Protocol/include/APL/CR_Protocol/CMakeLists.txt -text
 MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadRequest.h -text
diff --git a/MAC/APL/CEPCU/src/PythonControl/CMakeLists.txt b/MAC/APL/CEPCU/src/PythonControl/CMakeLists.txt
index 9388438f0fd1ba6b7090a438a49febfbdc96d1a2..6ad8270b539a75cb6067dda3dfffdadc744dface 100644
--- a/MAC/APL/CEPCU/src/PythonControl/CMakeLists.txt
+++ b/MAC/APL/CEPCU/src/PythonControl/CMakeLists.txt
@@ -27,7 +27,7 @@ lofar_add_bin_program(PythonControl
   PythonControlMain.cc
   PythonControl.cc)
 
-lofar_add_executable(tMDparser tMDparser.cc)
+lofar_add_sbin_program(uploadMetadata uploadMetadata.cc)
 
 install(FILES
   PythonControl.conf
diff --git a/MAC/APL/CEPCU/src/PythonControl/tMDparser.cc b/MAC/APL/CEPCU/src/PythonControl/uploadMetadata.cc
similarity index 86%
rename from MAC/APL/CEPCU/src/PythonControl/tMDparser.cc
rename to MAC/APL/CEPCU/src/PythonControl/uploadMetadata.cc
index 47a016f0c9cf9b072c3ce6b322a8845c14392d7d..998ffd788233c21e1fab6e7e5b8931ac3da1cd8c 100644
--- a/MAC/APL/CEPCU/src/PythonControl/tMDparser.cc
+++ b/MAC/APL/CEPCU/src/PythonControl/uploadMetadata.cc
@@ -34,23 +34,24 @@ using namespace OTDB;
 
 int main(int argc, char* argv[])
 {
-	if (argc != 4) {
-		cout << "Syntax: " << argv[0] << " databasename treeID metadatafile" << endl;
-		return (0);
+	if (argc != 5) {
+		cout << "Syntax: " << argv[0] << " databasename hostname treeID metadatafile" << endl;
+		return (-1);
 	}
 
 	// read parameterset
 	ParameterSet	metadata;
-	metadata.adoptFile(argv[3]);
+	metadata.adoptFile(argv[4]);
 
 	// Connect to KVT logger
-	OTDBconnection	conn("paulus", "boskabouter", argv[1], "RS005");
+	OTDBconnection	conn("paulus", "boskabouter", argv[1], argv[2]);
 	if (!conn.connect()) {
-		cerr << "Cannot connect to database " << argv[1] << " TEST_SAS2 on machine RS005" << endl;
-		return (1);
+		cerr << "Cannot connect to database " << argv[1] << " on machine " << argv[2] << endl;
+		return (-2);
 	}
+	cout << "Connected to database " << argv[1] << " on machine " << argv[2] << endl;
 
-	TreeValue	tv(&conn, atoi(argv[2]));
+	TreeValue	tv(&conn, atoi(argv[3]));
 
 	// Loop over the parameterset and send the information to the KVTlogger.
 	// During the transition phase from parameter-based to record-based storage in OTDB the
@@ -92,7 +93,7 @@ int main(int argc, char* argv[])
 		iter++;
 		cout << endl;
 	}
-    cout << "Done" << endl;
-	return (1);
+    cout << "Done, wrote" << metadata.size() << " values to SAS" << endl;
+	return (0);
 }