diff --git a/deb_package/openbmpd.defaults b/deb_package/openbmpd.defaults
index 9016406..825a864 100644
--- a/deb_package/openbmpd.defaults
+++ b/deb_package/openbmpd.defaults
@@ -2,8 +2,14 @@ LOGFILE=/var/log/openbmpd.log
 
 MYHOSTNAME=$(uname -n)
 
-OPENBMP_ADMIN_ID=${OPENBMP_ADMIN_ID:=$MYHOSTNAME}
-OPENBMP_BUFFER=${OPENBMP_BUFFER:='16'}
-OPENBMP_BROKER_LIST=${OPENBMP_BROKER_LIST:='localhost:9092'}
+CONFIG_FILE=/usr/etc/openbmp/openbmpd.conf
+PID_FILE=/var/run/openbmpd.pid
 
-OPENBMPD_OPTS="-l $LOGFILE -a ${OPENBMP_ADMIN_ID} -k ${OPENBMP_BROKER_LIST}  -p 5000 -b ${OPENBMP_BUFFER}"
+if [ -f /usr/local/etc/openbmp/openbmpd.conf ]; then
+   CONFIG_FILE=/usr/local/etc/openbmp/openbmpd.conf
+
+elif [ -f /etc/openbmp/openbmpd.conf ]; then
+    CONFIG_FILE=/etc/openbmp/openbmpd.conf
+fi
+
+OPENBMPD_OPTS="-l $LOGFILE -pid $PID_FILE -c $CONFIG_FILE"
diff --git a/docs/BUILD.md b/docs/BUILD.md
index 3328737..56dae3a 100644
--- a/docs/BUILD.md
+++ b/docs/BUILD.md
@@ -30,8 +30,11 @@ See [yaml-cpp](https://github.com/jbeder/yaml-cpp) for detailed instructions on
 git clone https://github.com/jbeder/yaml-cpp.git
 cd yaml-cpp
 
-# IF on CentOS6/RHEL6, use the following command to checkout release 0.5.3
-#git checkout release-0.5.3
+
+# git checkout yaml-cpp-0.6.2
+
+# If on Centos6 
+# git checkout yaml-cpp-0.5.3
 
 # IF on CentOS6/RHEL6 - you might run into an issue about date_time boost lib. This issue
 #    is specific to cmake on centos6/rhel6.   If you run into this issue, you can