diff --git a/etc/autodist/distdb.arm b/etc/autodist/distdb.arm
index d979afe..cfc9462 100644
--- a/etc/autodist/distdb.arm
+++ b/etc/autodist/distdb.arm
@@ -32,7 +32,7 @@ arm,mamba-arm
 linux_firmware=(
 linux-firmware
 target,KERNEL_TARGET,KERNEL_VER
-arm,mamba-arm,3.2
+arm,mamba-arm,-
 )
 
 pam=(
@@ -53,12 +53,6 @@ KERNEL_VER
 2.6.33mamba-arm
 )
 
-emacs=(
-emacs
-bootstrap
-1
-)
-
 gcc=(
 gcc
 cross_target_cpu,_target_platform,disable_java,disable_gjdoc
diff --git a/etc/autodist/distdb.i586 b/etc/autodist/distdb.i586
index 9f48aca..7891235 100644
--- a/etc/autodist/distdb.i586
+++ b/etc/autodist/distdb.i586
@@ -217,11 +217,30 @@ target,KERNEL_TARGET
 i586,mamba
 i586,mamba-64GB
 arm,mamba-arm
+arm,mamba-arm-kirkwood
+x86_64,mamba-x86_64
+)
+#i586,mamba-rt
+#i586,mamba-64GB-rt
+
+kernel_34=(
+kernel
+target,KERNEL_TARGET
+i586,mamba
+i586,mamba-64GB
+arm,mamba-arm
+arm,mamba-arm-kirkwood
 x86_64,mamba-x86_64
 i586,mamba-rt
 i586,mamba-64GB-rt
 )
 
+kernel_arm_kirkwood=(
+kernel
+target,KERNEL_TARGET
+arm,mamba-arm-kirkwood
+)
+
 kernel_milestone2=(
 kernel
 target,KERNEL_TARGET
@@ -255,7 +274,7 @@ x86_64,mamba-x86_64
 )
 
 kernel_packages=(
-hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,VirtualBox,\
+hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,ndiswrapper,NVIDIA,VirtualBox,\
 broadcom-sta,stk11xx,cm2020,r8101
 target,KERNEL_TARGET,KERNEL_VER
 i586,mamba,-
@@ -263,9 +282,10 @@ i586,mamba-64GB,-
 i586,mamba-rt,-
 i586,mamba-64GB-rt,-
 )
+#lirc
 
 kernel_packages_36=(
-hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,VirtualBox-kernel,\
+hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,ndiswrapper,NVIDIA,VirtualBox-kernel,\
 broadcom-sta,stk11xx,cm2020,r8101
 target,KERNEL_TARGET,KERNEL_VER
 i586,mamba,3.6
@@ -273,14 +293,18 @@ i586,mamba-64GB,3.6
 i586,mamba-rt,3.6
 i586,mamba-64GB-rt,3.6
 )
+#lirc
 
 kernel_packages_34=(
-hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,VirtualBox-kernel,\
+hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,ndiswrapper,NVIDIA,VirtualBox-kernel,\
 broadcom-sta,stk11xx,cm2020,r8101
 target,KERNEL_TARGET,KERNEL_VER
 i586,mamba,3.4
 i586,mamba-64GB,3.4
+i586,mamba-rt,3.4
+i586,mamba-64GB-rt,3.4
 )
+#lirc
 
 kernel_packages_32=(
 hsfmodem,slmodem,compat-wireless,alsa-driver,ati-driver,lirc,ndiswrapper,NVIDIA,NVIDIA_71xx,NVIDIA_96xx,NVIDIA_173xx,VirtualBox-kernel,\
@@ -315,3 +339,9 @@ kernel-iconia
 target,_target_platform
 arm,arm-none-linux-gnueabi
 )
+
+linux_firmware=(
+linux-firmware
+target,KERNEL_TARGET,KERNEL_VER
+i586,mamba,3.6
+)
diff --git a/etc/autodist/distdb.x86_64 b/etc/autodist/distdb.x86_64
index 72a53f6..cd3adf6 100644
--- a/etc/autodist/distdb.x86_64
+++ b/etc/autodist/distdb.x86_64
@@ -268,12 +268,6 @@ bootstrap
 1
 )
 
-emacs=(
-emacs
-bootstrap
-1
-)
-
 gcc=(
 gcc
 cross_target_cpu,_target_platform,disable_jack,disable_gjdoc,disable_java
diff --git a/etc/autodist/legacy b/etc/autodist/legacy
index 1e3c519..b45fb65 100644
--- a/etc/autodist/legacy
+++ b/etc/autodist/legacy
@@ -113,3 +113,7 @@ libdirectfb5
 libtasn1_3
 kdelibs3
 goocanvas
+libraptor
+python
+liblcms
+libpng14
diff --git a/etc/autodist/unstage.arm b/etc/autodist/unstage.arm
index c401eff..04944ec 100644
--- a/etc/autodist/unstage.arm
+++ b/etc/autodist/unstage.arm
@@ -27,3 +27,10 @@ autoconf
 libidn
 libcanberra
 libxml2
+libcaca
+libproxy
+libphonon
+xmms2
+libalsa-plugins
+gutenprint
+gpm
diff --git a/etc/autodist/unstage.x86_64 b/etc/autodist/unstage.x86_64
index 5581631..f3ae7ae 100644
--- a/etc/autodist/unstage.x86_64
+++ b/etc/autodist/unstage.x86_64
@@ -7,3 +7,9 @@ libnfsidmap
 libXext
 libidn
 libtiff
+liblcms
+python
+glib
+libcanberra
+avahi
+gpm