diff --git a/manage-config b/manage-config
index b5de5c99aa86..e3570db756f5 100755
--- a/manage-config
+++ b/manage-config
@@ -79,7 +79,9 @@ if [ -e ${exclusion_file} -o -e ${inclusion_file} -o -e ${force_inclusion_file}
         inclusion_opts=$(get_section_opts ${inclusion_file} "common" ${ARCH} ${PLATFORM})
         while read -r opt; do
             if [ ! -z "$opt" ] && [[ ! "$opt" =~ ^#.* ]]; then
-                echo $opt >> ${CONFIG_FILE}
+                n=${opt%=*}
+                v="${opt#*=}"
+                scripts/config --file ${CONFIG_FILE} -k --set-val "$n" "$v"
             fi
         done <<< ${inclusion_opts};
     fi
@@ -113,6 +115,8 @@ if [ -e ${exclusion_file} -o -e ${inclusion_file} -o -e ${force_inclusion_file}
             if [ ! -z "$opt" ] && [[ ! "$opt" =~ ^#.* ]]; then
                 n=${opt%=*}
                 v="${opt#*=}"
+                v="${v/#\"/}"
+                v="${v/%\"/}"
                 s=$(scripts/config --file ${CONFIG_FILE} -k --state $n)
                 if [ ! "$s" = "$v" ]; then
                     ret=2