diff --git a/etc/autodist/distdb b/etc/autodist/distdb
index 2454aaf..b5c4991 100644
--- a/etc/autodist/distdb
+++ b/etc/autodist/distdb
@@ -168,22 +168,25 @@ i586,mamba-64GB
 )
 
 xorg_drv_video=(
-xorg-drv-video,xorg-drv-video-apm,xorg-drv-video-ark,xorg-drv-video-ast,xorg-drv-video-ati,\
+xorg-drv-video-apm,xorg-drv-video-ark,xorg-drv-video-ast,xorg-drv-video-ati,\
 xorg-drv-video-chips,xorg-drv-video-cirrus,xorg-drv-video-dummy,xorg-drv-video-fbdev,\
 xorg-drv-video-geode,xorg-drv-video-glint,xorg-drv-video-i128,xorg-drv-video-i740,\
 xorg-drv-video-intel,xorg-drv-video-mach64,xorg-drv-video-mga,xorg-drv-video-neomagic,\
 xorg-drv-video-newport,xorg-drv-video-nouveau,xorg-drv-video-nv,xorg-drv-video-openchrome,\
 xorg-drv-video-r128,xorg-drv-video-radeonhd,xorg-drv-video-rendition,xorg-drv-video-s3,\
 xorg-drv-video-s3virge,xorg-drv-video-savage,xorg-drv-video-siliconmotion,xorg-drv-video-sis,\
-xorg-drv-video-sisusb,xorg-drv-video-trident,xorg-drv-video-tseng,xorg-drv-video-v4l,\
-xorg-drv-video-vesa,xorg-drv-video-vmware,xorg-drv-video-voodoo,xorg-drv-video-xgixp
+xorg-drv-video-trident,xorg-drv-video-tseng,xorg-drv-video-v4l,\
+xorg-drv-video-vesa,xorg-drv-video-vmware,xorg-drv-video-voodoo,xorg-drv-video-xgixp,\
+xorg-drv-video
 )
+#xorg-drv-video-sisusb,
 
 xorg_drv_input=(
-xorg-drv-input,xorg-drv-input-acecad,xorg-drv-input-aiptek,xorg-drv-input-elographics,\
+xorg-drv-input-acecad,xorg-drv-input-aiptek,xorg-drv-input-elographics,\
 xorg-drv-input-evdev,xorg-drv-input-fpit,xorg-drv-input-hyperpen,xorg-drv-input-joystick,\
 xorg-drv-input-keyboard,xorg-drv-input-mouse,xorg-drv-input-mutouch,xorg-drv-input-penmount,\
-xorg-drv-input-synaptics,xorg-drv-input-tslib,xorg-drv-input-vmmouse,xorg-drv-input-void
+xorg-drv-input-synaptics,xorg-drv-input-tslib,xorg-drv-input-vmmouse,xorg-drv-input-void,\
+xorg-drv-input
 )
 
 abiword=(
@@ -241,12 +244,14 @@ kdesdk,kdetoys,kdebindings,kdewebdev,kdeedu,kdeartwork,kde-i18n
 kde4=(
 kdelibs,kdepimlibs,oxygen-icons,kde-runtime,kde-workspace,kde-wallpapers,kde-baseapps,kdepim4,\
 kdepim-runtime,kdeadmin,kdemultimedia,kdenetwork4,kdeartwork,kdegames,kdetoys,kdesdk,marble,\
-kdeplasma-addons,kde-l10n,blinken,cantor,gwenview,libkdeedu,libanalitza,kalgebra,kalzium,kamera,\
+kdeplasma-addons,kde-l10n,blinken,cantor,gwenview,libkdeedu,kalgebra,kalzium,kamera,\
 kanagram,kate,kbruch,kcolorchooser,kdegraphics-strigi-analyzer,kgamma,kgeography,khangman,kig,kiten,\
 klettres,kmplot,kolourpaint,konsole,kruler,ksnapshot,kstars,libkdcraw,libkexiv2,libkipi,libksane,\
 okular,smokegen,smokeqt,smokekde,svgpart,rocs,kwordquiz,kturtle,ktouch,qtruby,korundum,\
 kross-interpreters,perl-Qt4,perl-KDE,kdegraphics-thumbnailers,ksaneplugin,parley,step,\
-ark,filelight,kcalc,kcharselect,kdf,kfloppy,kgpg,kremotecontrol,ktimer,kwallet,sweeper
+ark,filelight,kcalc,kcharselect,kdf,kfloppy,kgpg,kremotecontrol,ktimer,kwallet,sweeper,\
+analitza,jovie,kmousetool,kmouth,qyoto,kaccessible,ksecrets,printer-applet,\
+kdegraphics-mobipocket,kactivities
 %build_and_install
 1
 )
diff --git a/etc/autodist/distdb.i586 b/etc/autodist/distdb.i586
index f99833e..6ae0002 100644
--- a/etc/autodist/distdb.i586
+++ b/etc/autodist/distdb.i586
@@ -75,11 +75,12 @@ avr,avr,1
 #
 glibc=(
 glibc
-cross_target_cpu,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER
-i586,i586-openmamba-linux-gnu,-,-,mamba,-
-x86_64,x86_64-openmamba-linux-gnu,-,-,mamba-x86_64,2.6.33
-arm,arm-openmamba-linux-gnueabi,-,-,mamba-arm,-
-ppc,ppc-openmamba-linux-gnu,-,-,mamba-ppc,2.6.33
+target,cross_target_cpu,multilib,_target_platform,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER
+-,i586,-,i586-openmamba-linux-gnu,-,-,mamba,-
+-,x86_64,-,x86_64-openmamba-linux-gnu,-,-,mamba-x86_64,-
+-,arm,-,arm-openmamba-linux-gnueabi,-,-,mamba-arm,-
+-,ppc,-,ppc-openmamba-linux-gnu,-,-,mamba-ppc,2.6.33
+x86_64,i586,1,i586-openmamba-linux-gnu,-,-,mamba-x86_64,-
 )
 
 # XTC 7
diff --git a/etc/autodist/legacy b/etc/autodist/legacy
index 3975742..3602f2d 100644
--- a/etc/autodist/legacy
+++ b/etc/autodist/legacy
@@ -81,3 +81,4 @@ libwpg01
 libwps01
 libwpd08
 db52
+glade-3