diff --git a/configure b/configure
index 4b311f7f8..499f7a64f 100755
--- a/configure
+++ b/configure
@@ -157,7 +157,7 @@ cat > $BUILD_CONFIG_FILE <<-EOF
 	WITH_NETLINK=${WITH_NETLINK:-0}
 	EOF
 
-CONFIG_FILES=`ls $SCRIPTPATH/configure.d/*.conf | sort`
+CONFIG_FILES=`ls $SCRIPTPATH/configure.d/*.conf | LC_ALL=C sort`
 FILES_COUNT=`echo $CONFIG_FILES | wc -w`
 
 CONFIG_FILE=$SCRIPTPATH/"config.out"
@@ -197,14 +197,15 @@ generate_config() {
 		exit 1
 	fi
 
+	LC_ALL=C sort -o ${CONFIG_FILE} ${CONFIG_FILE}
 	echo "$KERNEL_DIR_TAG $(realpath "$KERNEL_DIR")" >> ${CONFIG_FILE}
 }
 
 generate_header() {
 	rm -f $SCRIPTPATH/modules/generated_defines.h
 	# Configs starting with '1_' have to be put as first in header
-	FIRST=$(echo $CONFIG_FILES | tr ' ' '\n' | grep '1_')
-	SECOND=$(echo $CONFIG_FILES | tr ' ' '\n' | grep '2_')
+	FIRST=$(echo $CONFIG_FILES | tr ' ' '\n' | grep '/1_[^/]*$')
+	SECOND=$(echo $CONFIG_FILES | tr ' ' '\n' | grep '/2_[^/]*$')
 
 	echo "#ifndef __GENERATED_DEFINES_H__" >> $SCRIPTPATH/modules/generated_defines.h
 	echo "#define __GENERATED_DEFINES_H__" >> $SCRIPTPATH/modules/generated_defines.h