diff --git a/MAC/Deployment/data/PVSS/create_db_files b/MAC/Deployment/data/PVSS/create_db_files
index 738cdb2f89654421df62b2e013f33adf42db3b28..052cc5325393ad4543778c021a210a42cb2c450e 100755
--- a/MAC/Deployment/data/PVSS/create_db_files
+++ b/MAC/Deployment/data/PVSS/create_db_files
@@ -47,7 +47,7 @@ SyntaxError()
         echo "                 Output dir is then /opt/pvss/dpdef (overrules -d)"
 	echo "    -C           CEP datapoints are created (overrules -s)"
 	echo "    -M           MainCU datapoints are created (overrules -s)"
-	echo ""
+	echo "    Default option is -M"
 	exit 1
 }
 
@@ -1207,14 +1207,14 @@ if [ "$DBTYPE" == "S" -a "$DBTYPENAME" == "LOCALHOST" ]; then
    STNNAME=$DBTYPENAME
    cd $DESTDIR
    echo "Making files for station $STNNAME in $DESTDIR"
-elif [ "$DBTYPE" == "M" ]; then  
+elif [ "$DBTYPE" == "M" -a "$HOSTNAME" == "MCU001" ]; then  
    configdir="/opt/lofar/etc/"
    dpdefdir="/opt/pvss/dpdef/"
    DESTDIR=$dpdefdir
    STNNAME=$DBTYPENAME
    cd $DESTDIR
    echo "Making files for $STNNAME in $DESTDIR"
-elif [ "$DBTYPE" == "C" ]; then  
+elif [ "$DBTYPE" == "C" -a "$HOSTNAME" == "CCU001" ]; then  
    configdir="/opt/lofar/etc/"
    dpdefdir="/opt/pvss/dpdef/"
    DESTDIR=$dpdefdir
@@ -1268,8 +1268,9 @@ create_dp_file  ${INPUTFILE} ${DBTYPE}
 cat ${TMP_FILE} >>${DESTDIR}/${DPT_FILE}
 rm -f ${TMP_FILE}
 
-# Creating the c++ header file is for development, only
-if [ "${DBTYPE}" != "S" -a "${DBTYPE}" != "M" -a "${DBTYPE}" != "C"]; then
+# Creating the c++ header file is for development hosts, only; in that case
+# the $dpdefdir is an empty string
+if [ "${dpdefdir}" == "" ]; then
   (
 	echo -n "// This file was generated by $(basename $0) ${VERSION} on " ; date
 	echo	""