diff --git a/boot.sysctl b/boot.sysctl
index 044af16..131af39 100644
--- a/boot.sysctl
+++ b/boot.sysctl
@@ -24,6 +24,14 @@ rc_reset
 
 case "$1" in
   start)
+
+	# Load per-kernel defaults from /boot. This file is provided
+	# by the kernel package and will be replaced on update.
+	if test -e "/boot/sysctl.conf-$(uname -r)"; then
+	    echo -n "Loading sysctl defaults from /boot/sysctl.conf-$(uname -r)"
+	    sysctl -e -q -p /boot/sysctl.conf-$(uname -r)
+	    rc_status -v -r
+	fi
 	#
 	# run sysctl if the config file exists
 	# otherwise generate it
diff --git a/procps.changes b/procps.changes
index af1c548..a0d14f6 100644
--- a/procps.changes
+++ b/procps.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu May  5 17:49:30 CEST 2011 - jeffm@suse.de
+
+- boot.sysctl: Add support for loading defaults from
+  /boot/sysctl.conf-$(uname -r) before loading /etc/sysctl.conf
+  to allow each kernel flavor to adjust defaults without
+  different kernel configuration options.
+
 -------------------------------------------------------------------
 Tue Mar 22 17:31:22 UTC 2011 - idoenmez@novell.com