2 files changed, 12 insertions, 2 deletions

diff --git a/libbb/Config.src b/libbb/Config.src
index b980f19a9..61b4601d6 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -188,6 +188,16 @@ config FEATURE_EDITING_HISTORY
         help
         Specify command history size (0 - disable).
 
+config FEATURE_EDITING_HISTORY_DEFAULT
+        int "Default history size"
+        range 0 FEATURE_EDITING_HISTORY
+        default 255
+        depends on PLATFORM_MINGW32 && FEATURE_EDITING && FEATURE_SH_HISTFILESIZE
+        help
+        Specify default command history size. This may be smaller than
+        FEATURE_EDITING_HISTORY, in which case the user may increase
+        the history size by setting HISTFILESIZE.
+
 config FEATURE_EDITING_SAVEHISTORY
         bool "History saving"
         default y
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 1a095b657..811e3e475 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1585,8 +1585,8 @@ line_input_t* FAST_FUNC new_line_input_t(int flags)
 
 unsigned FAST_FUNC size_from_HISTFILESIZE(const char *hp)
 {
-# if ENABLE_PLATFORM_MINGW32 && MAX_HISTORY > 511
-        int size = 384;
+# if ENABLE_PLATFORM_MINGW32 && DEFAULT_HISTORY > 0 && DEFAULT_HISTORY <= MAX_HISTORY
+        int size = DEFAULT_HISTORY;
 # else
         int size = MAX_HISTORY;
 # endif