diff --git a/SuSE.config b/SuSE.config
index 0d3f2fe..5b56176 100644
--- a/SuSE.config
+++ b/SuSE.config
@@ -642,7 +642,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
 CONFIG_FEATURE_COMMAND_EDITING=y
 CONFIG_FEATURE_COMMAND_EDITING_VI=y
-CONFIG_FEATURE_COMMAND_HISTORY=15
+CONFIG_FEATURE_COMMAND_HISTORY=666
 CONFIG_FEATURE_COMMAND_SAVEHISTORY=y
 CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
 # CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
diff --git a/busybox.changes b/busybox.changes
index 2e90f1b..5c245c1 100644
--- a/busybox.changes
+++ b/busybox.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May 11 16:18:53 CEST 2007 - olh@suse.de
+
+- increase ash cmdline history size
+  user kernel ringbuffer size for dmesg
+
 -------------------------------------------------------------------
 Mon May  7 10:27:51 CEST 2007 - olh@suse.de
 
diff --git a/busybox.dmesg-size.patch b/busybox.dmesg-size.patch
new file mode 100644
index 0000000..1cb60a9
--- /dev/null
+++ b/busybox.dmesg-size.patch
@@ -0,0 +1,32 @@
+---
+ util-linux/dmesg.c |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+Index: busybox-1.4.2/util-linux/dmesg.c
+===================================================================
+--- busybox-1.4.2.orig/util-linux/dmesg.c
++++ busybox-1.4.2/util-linux/dmesg.c
+@@ -13,6 +13,14 @@
+ #include <unistd.h>
+ #include <sys/klog.h>
+ 
++static int kernel_ringbuffer_size(void)
++{
++	int len = klogctl(10, NULL, 0);
++	if (len > 0)
++		return len;
++	return 16384;
++}
++
+ int dmesg_main(int argc, char *argv[])
+ {
+ 	char *size, *level;
+@@ -25,7 +33,7 @@ int dmesg_main(int argc, char *argv[])
+ 		int len;
+ 		char *buf;
+ 
+-		len = (flags & 2) ? xatoul_range(size, 2, INT_MAX) : 16384;
++		len = (flags & 2) ? xatoul_range(size, 2, INT_MAX) : kernel_ringbuffer_size();
+ 		buf = xmalloc(len);
+ 		if (0 > (len = klogctl(3 + (flags & 1), buf, len)))
+ 			bb_perror_msg_and_die("klogctl");
diff --git a/busybox.spec b/busybox.spec
index bf87ab7..90d0c09 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -14,7 +14,7 @@ Name:           busybox
 BuildRequires:  dietlibc
 URL:            http://www.busybox.net/
 Version:        1.4.2
-Release:        3
+Release:        5
 Summary:        The Swiss Army Knife of Embedded Linux
 License:        GNU General Public License (GPL)
 Group:          System/Base
@@ -24,6 +24,7 @@ Source2:        SuSE.config
 Patch0:         busybox.taskset-range.patch
 Patch1:         busybox.install.patch
 Patch2:         busybox.libunarchive-array.patch
+Patch3:         busybox.dmesg-size.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -48,6 +49,7 @@ Authors:
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 cp -avL %{S:2} .config
@@ -80,6 +82,9 @@ install -m 644 docs/BusyBox.1 $RPM_BUILD_ROOT%_mandir/man1
 %config /usr/share/busybox/busybox.links
 
 %changelog
+* Fri May 11 2007 - olh@suse.de
+- increase ash cmdline history size
+  user kernel ringbuffer size for dmesg
 * Mon May 07 2007 - olh@suse.de
 - gcc42 rejects out of bounds array access
 * Sat Apr 28 2007 - olh@suse.de