diff --git a/aaa_base.changes b/aaa_base.changes
index e6f55a9..3098db2 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun 29 08:20:45 UTC 2012 - lnussel@suse.de
+
+- move environment settings for malloc checking to separate
+  subpackage for easier handling of the feature via patterns
+
 -------------------------------------------------------------------
 Mon Jun 25 09:03:20 CEST 2012 - vuntz@opensuse.org
 
diff --git a/aaa_base.spec b/aaa_base.spec
index e1732c8..58f96e7 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -16,8 +16,6 @@
 #
 
 
-%bcond_with     aaa_base_malloc_debug
-
 Name:           aaa_base
 Version:        12.2
 Release:        0
@@ -63,6 +61,16 @@ The parts of aaa_base that should be installed by default but are not
 strictly required to run a system. (Shell aliases, bash completions
 and convenience hacks).
 
+%package malloccheck
+Summary:        SUSE Linux Base Package (malloc checking)
+Group:          System/Fhs
+Requires:       %{name} = %{version}
+
+%description malloccheck
+This package sets environment variables that enable stricter
+malloc checks to catch potential heap corruptions. It's not
+installed by default as it may degrade performance.
+
 %prep
 %setup -n aaa_base
 
@@ -84,10 +92,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 # make sure it does not creep in again
 test -d $RPM_BUILD_ROOT/root/.gnupg && exit 1
 #
-# for the release
-%if !%{with aaa_base_malloc_debug}
-rm $RPM_BUILD_ROOT/etc/profile.d/malloc-debug.*
-%endif
 #
 # mark these as ghost
 for i in passwd group shadow gshadow ; do
@@ -127,10 +131,6 @@ 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
@@ -250,4 +250,8 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 /usr/share/man/man8/resolv+.8*
 /usr/share/man/man8/quick_halt.8*
 
+%files malloccheck
+%config /etc/profile.d/malloc-debug.sh
+%config /etc/profile.d/malloc-debug.csh
+
 %changelog