diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
old mode 100755
new mode 100644
index 63c8565206a451c4c3e800148b209b0e98d47432..63c664ef518a5a5f4e821f9d571b50091de15546
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -104,7 +104,7 @@ fi
 
 MERGE_LIST=$*
 SED_CONFIG_EXP1="s/^\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)=.*/\1/p"
-SED_CONFIG_EXP2="s/^# \(${CONFIG_PREFIX}[a-zA-Z0-9_]*\) is not set$/\1/p"
+SED_CONFIG_EXP2="s/^#\s*\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)\s*is\s*not\s*set\r*$/\1/p"
 
 TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
 MERGE_FILE=$(mktemp ./.merge_tmp.config.XXXXXXXXXX)
@@ -114,6 +114,7 @@ echo "Using $INITFILE as base"
 trap clean_up EXIT
 
 cat $INITFILE > $TMP_FILE
+echo "" >> $TMP_FILE
 
 # Merge files, printing warnings on overridden values
 for ORIG_MERGE_FILE in $MERGE_LIST ; do
@@ -151,6 +152,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
 		fi
 	done
 	cat $MERGE_FILE >> $TMP_FILE
+	echo "" >> $TMP_FILE
 done
 
 if [ "$RUNMAKE" = "false" ]; then