diff --git a/etc/autodist/distdb b/etc/autodist/distdb
index 2bc1ea4..e9a8e51 100644
--- a/etc/autodist/distdb
+++ b/etc/autodist/distdb
@@ -186,11 +186,11 @@ libgnome-panel,anjuta,zenity,metacity,nautilus,brasero,cheese,evince,gconf-edito
 1,1
 )
 
-fwbuilder=(
-libfwbuilder,fwbuilder
-%build_and_install
-1
-)
+#fwbuilder=(
+#libfwbuilder,fwbuilder
+#%build_and_install
+#1
+#)
 
 koffice=(
 koffice
diff --git a/etc/autodist/distdb.i586 b/etc/autodist/distdb.i586
index 60e601b..8a35859 100644
--- a/etc/autodist/distdb.i586
+++ b/etc/autodist/distdb.i586
@@ -15,6 +15,7 @@ binutils
 cross_target_cpu,_target_platform
 i586,i586-openmamba-linux-gnu
 arm,arm-openmamba-linux-gnueabi
+arm,arm-openmamba-linux-gnueabihf
 avr,avr
 x86_64,x86_64-openmamba-linux-gnu
 ppc,ppc-openmamba-linux-gnu
@@ -93,6 +94,12 @@ ppc,1,ppc-openmamba-linux-gnu
 x86_64,1,x86_64-openmamba-linux-gnu
 )
 
+gcc_arm=(
+gcc
+cross_target_cpu,_target_platform,disable_java
+arm,arm-openmamba-linux-gnueabi,1
+)
+
 glibc_arm=(
 glibc
 cross_target_cpu,bigendian,softfloat,KERNEL_TARGET,KERNEL_VER
@@ -176,6 +183,25 @@ cross_target_cpu,_target_platform
 arm,arm-openmamba-linux-gnueabi
 )
 
+glibc_stage2_armhf=(
+glibc
+cross_target_cpu,stage2,bigendian,hardfloat,_target_platform,KERNEL_TARGET,KERNEL_VER
+arm,1,-,1,arm-openmamba-linux-gnueabi,mamba-arm,3.4
+)
+
+#
+# armhf cross toolchain
+#
+binutils_armhf=(
+binutils
+cross_target_cpu,_target_platform
+)
+
+glibc_stage1_armhf=(
+glibc
+cross_target_cpu,stage1,_target_platform,KERNEL_TARGET,KERNEL_VER
+armhf,1,arm-openmamba-linux-gnueabihf,mamba-arm,3.4
+)
 
 #
 # ppc cross toolchain
diff --git a/etc/autodist/legacy b/etc/autodist/legacy
index 5bf4831..6202fdb 100644
--- a/etc/autodist/legacy
+++ b/etc/autodist/legacy
@@ -58,7 +58,6 @@ kdegraphics
 synaptic
 libjpeg7
 kdevelop
-libgda
 objectweb-asm1
 objectweb-asm2
 apache-tomcat5
@@ -83,7 +82,6 @@ libwpd08
 db52
 glade-3
 goocanvas
-libnl1
 moagg
 apache-commons-digester18
 x264-116
diff --git a/etc/autodist/unstage.arm b/etc/autodist/unstage.arm
index a3eff84..c1a4ea7 100644
--- a/etc/autodist/unstage.arm
+++ b/etc/autodist/unstage.arm
@@ -39,3 +39,5 @@ groff
 graphviz
 python26
 python27
+beecrypt
+ncurses
diff --git a/etc/autodist/unstage.x86_64 b/etc/autodist/unstage.x86_64
index 8225d78..03ee89f 100644
--- a/etc/autodist/unstage.x86_64
+++ b/etc/autodist/unstage.x86_64
@@ -26,3 +26,4 @@ libalsa-plugins
 libproxy
 python26
 python27
+beecrypt
diff --git a/etc/cron.hourly/60-autodist-update b/etc/cron.hourly/60-autodist-update
index 8da29d2..4a662ac 100755
--- a/etc/cron.hourly/60-autodist-update
+++ b/etc/cron.hourly/60-autodist-update
@@ -48,7 +48,7 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
 
    if [ "${AUTOPORT_UPDATE[$i]}" ]; then
       pid_check
-      distromatic -q -t $DISTROMATIC_REPOSITORY --gensrcpkglist > $LOCAL_REPS_BASE_DIR/$DISTROMATIC_REPOSITORY/srcpkglist
+      distromatic -q -t $DISTROMATIC_REPOSITORY --gensrcpkglist > $LOCAL_REPS_BASE_DIR/$DISTROMATIC_REPOSITORY/srcpkglist 2>/dev/null
 
       pid_check
       autodist-upstream-updates -q -h -u -r $DISTROMATIC_REPOSITORY -o $r \