diff --git a/etc/autodist/distdb.i586 b/etc/autodist/distdb.i586
index be2eef0..7a100ef 100644
--- a/etc/autodist/distdb.i586
+++ b/etc/autodist/distdb.i586
@@ -210,9 +210,9 @@ kernel
 target,KERNEL_TARGET
 i586,mamba
 i586,mamba-64GB
+arm,mamba-arm
+x86_64,mamba-x86_64
 )
-#arm,mamba-arm
-#x86_64,mamba-x86_64
 
 kernel_64GB=(
 kernel
@@ -241,20 +241,12 @@ arm
 #ppc,mamba
 #x86_64,mamba
 
-kernel_extramodules=(
-kernel-extramodules
-target,KERNEL_TARGET
-i586,mamba
-i586,mamba-64GB
-)
-
-kernel_packages_old=(
-hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox,\
-broadcom-sta,atheros-81,drbd,rtl8192se
-target,KERNEL_TARGET,KERNEL_VER
-i586,mamba,3.0
-i586,mamba-64GB,3.0
-)
+#kernel_extramodules=(
+#kernel-extramodules
+#target,KERNEL_TARGET
+#i586,mamba
+#i586,mamba-64GB
+#)
 
 kernel_packages=(
 hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox,\
@@ -264,6 +256,22 @@ i586,mamba,-
 i586,mamba-64GB,-
 )
 
+kernel_packages_30=(
+hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox,\
+broadcom-sta,atheros-81,drbd,rtl8192se
+target,KERNEL_TARGET,KERNEL_VER
+i586,mamba,3.0
+i586,mamba-64GB,3.0
+)
+
+kernel_packages_32=(
+hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox,\
+broadcom-sta,stk11xx,cm2020,r8101
+target,KERNEL_TARGET,KERNEL_VER
+i586,mamba,3.2
+i586,mamba-64GB,3.2
+)
+
 kernel_packages_34=(
 hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,NVIDIA,\
 broadcom-sta,stk11xx,cm2020,r8101
@@ -340,6 +348,13 @@ i586,mamba
 i586,mamba-64GB
 )
 
+NVIDIA_32=(
+NVIDIA
+target,KERNEL_TARGET,KERNEL_VER
+i586,mamba,3.2
+i586,mamba-64GB,3.2
+)
+
 VirtualBox=(
 VirtualBox
 target,KERNEL_TARGET
@@ -347,6 +362,13 @@ i586,mamba
 i586,mamba-64GB
 )
 
+VirtualBox_32=(
+VirtualBox
+target,KERNEL_TARGET,KERNEL_VER
+i586,mamba,3.2
+i586,mamba-64GB,3.2
+)
+
 VirtualBox_34=(
 VirtualBox
 target,KERNEL_TARGET,KERNEL_VER