diff --git a/aaa_base.changes b/aaa_base.changes
index 63fc0fd..20478e7 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 14 13:23:35 UTC 2011 - lnussel@suse.de
+
+- don't time out waiting for tmpfs (bnc#671468)
+- make malloc checking configurable
+
 -------------------------------------------------------------------
 Fri Feb 11 18:39:04 CET 2011 - werner@suse.de
 
diff --git a/aaa_base.spec b/aaa_base.spec
index f7cb387..a0454b1 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -17,6 +17,7 @@
 
 # norootforbuild
 
+%bcond_with     aaa_base_malloc_debug
 
 Name:           aaa_base
 Version:        11.4
@@ -75,7 +76,9 @@ install -d -m 700 root
 test -d ../aaa_base/root/.gnupg && exit 1
 cp -a ../aaa_base/* $RPM_BUILD_ROOT
 # for the release
-#rm $RPM_BUILD_ROOT/etc/profile.d/malloc-debug.*
+%if !%{with aaa_base_malloc_debug}
+rm $RPM_BUILD_ROOT/etc/profile.d/malloc-debug.*
+%endif
 cp $RPM_SOURCE_DIR/get_kernel_version $RPM_BUILD_ROOT/sbin
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 for i in $RPM_BUILD_DIR/sysconfig_parts/sysconfig.* ; do
@@ -137,8 +140,10 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 %config /etc/profile.d/csh.utf8
 %config /etc/profile.d/lang.csh
 %config /etc/profile.d/lang.sh
+%if %{with aaa_base_malloc_debug}
 %config /etc/profile.d/malloc-debug.sh
 %config /etc/profile.d/malloc-debug.csh
+%endif
 %config /etc/profile.d/profile.csh
 %config /etc/profile.d/profile.sh
 %config /etc/profile.d/sh.ssh
diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2
index 461b302..f4ad470 100644
--- a/aaa_base.tar.bz2
+++ b/aaa_base.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26fb1ee885e68f4ee96406677b507266001b2f117b67baa2f6a1161b7265894c
-size 82163
+oid sha256:f2dad652bf5613664c79a5a18e08959bad633c189f3819b381b810762b7683c9
+size 82211