diff --git a/debian/changelog b/debian/changelog
index 540f41aca..98f69f812 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,20 @@ linux-2.6 (2.6.31~rc6-1~experimental.1) UNRELEASED; urgency=low
 
  -- maximilian attems <maks@debian.org>  Thu, 18 Jun 2009 23:50:56 +0200
 
+linux-2.6 (2.6.30-6) unstable; urgency=high
+
+  [ Bastian Blank ]
+  * Set default low address space protection to default value.
+
+  [ dann frazier ]
+  * Make sock_sendpage() use kernel_sendpage() (CVE-2009-2692)
+  * flat: fix uninitialized ptr with shared libs
+  * [parisc] isa-eeprom - Fix loff_t usage
+  * do_sigaltstack: avoid copying 'stack_t' as a structure to user space
+  * posix-timers: Fix oops in clock_nanosleep() with CLOCK_MONOTONIC_RAW
+
+ -- Bastian Blank <waldi@debian.org>  Sat, 15 Aug 2009 15:50:02 +0200
+
 linux-2.6 (2.6.30-5) unstable; urgency=high
 
   [ maximilian attems ]
diff --git a/debian/config/config b/debian/config/config
index 455c9c211..d36525af6 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3454,7 +3454,7 @@ CONFIG_SECURITY_NETWORK_XFRM=y
 # CONFIG_SECURITY_PATH is not set
 CONFIG_SECURITY_FILE_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
-CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
+CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=4096
 
 ##
 ## file: security/integrity/ima/Kconfig