diff --git a/platforms/livecd-root/Makefile b/platforms/livecd-root/Makefile
index cb85593..a192011 100644
--- a/platforms/livecd-root/Makefile
+++ b/platforms/livecd-root/Makefile
@@ -16,7 +16,7 @@ $(MAKEDIST_TARGET)-livecd-root: \
                   xorg-drv-input-synaptics xorg-apps-extra xterm \
                   ttf-freefont liberation-fonts-ttf \
                   gparted gag ntfs-3g libdvdcss \
-                  firefox compiz \
+                  chromium compiz \
                   macbook-tools livecd-tools \
                   Mesa-tools driconf parted testdisk \
                   compizconfig-settings-manager compiz-fusion-plugins-main \
@@ -33,8 +33,10 @@ $(MAKEDIST_TARGET)-livecd-root: \
 $(MAKEDIST_TARGET)-livecd-root-en: \
                   kde-l10n-en_GB
 $(MAKEDIST_TARGET)-livecd-root-es: \
-                  kde-l10n-es firefox-i18n-es-ES
+                  kde-l10n-es
+#                   firefox-i18n-es-ES
 $(MAKEDIST_TARGET)-livecd-root-it: \
-                  kde-l10n-it firefox-i18n-it
+                  kde-l10n-it
+#                   firefox-i18n-it
 #OpenOffice-i18n-it
 # FIXME: add kdepim
diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh
index d52a2b5..872827a 100644
--- a/platforms/livecd-root/post.inc.sh
+++ b/platforms/livecd-root/post.inc.sh
@@ -57,8 +57,8 @@ mkdir -p $MOUNTDIR/root/Desktop/
 cp $MOUNTDIR/usr/share/applications/openmamba-installer.desktop $MOUNTDIR/root/Desktop/
 cp $MOUNTDIR/usr/share/applications/openmamba-bootrecover.desktop $MOUNTDIR/root/Desktop/
 
-# configure fireofox as favorite in kde menu
-for f in /usr/share/applications/mozilla-firefox3.desktop /opt/kde/share/applications/kaffeine.desktop; do
+# configure favorites in kde menu
+for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do
    chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
 done
 
diff --git a/platforms/testcd-root/Makefile b/platforms/testcd-root/Makefile
index 938fd65..59a08bc 100644
--- a/platforms/testcd-root/Makefile
+++ b/platforms/testcd-root/Makefile
@@ -17,7 +17,7 @@ $(MAKEDIST_TARGET)-testcd-root: \
                   xorg-drv-input-synaptics xorg-apps-extra xterm \
                   ttf-freefont liberation-fonts-ttf \
                   gparted gag ntfs-3g libdvdcss \
-                  firefox compiz \
+                  chromium compiz \
                   macbook-tools livecd-tools \
                   Mesa-tools driconf parted testdisk \
                   compizconfig-settings-manager compiz-fusion-plugins-main \
@@ -34,8 +34,10 @@ $(MAKEDIST_TARGET)-testcd-root: \
 $(MAKEDIST_TARGET)-testcd-root-en: \
                   kde-l10n-en_GB
 $(MAKEDIST_TARGET)-testcd-root-es: \
-                  kde-l10n-es firefox-i18n-es-ES
+                  kde-l10n-es
+# firefox-i18n-es-ES
 $(MAKEDIST_TARGET)-testcd-root-it: \
-                  kde-l10n-it firefox-i18n-it
+                  kde-l10n-it
+# firefox-i18n-it
 #OpenOffice-i18n-it
 # FIXME: add kdepim
diff --git a/platforms/testcd-root/post.inc.sh b/platforms/testcd-root/post.inc.sh
index 1dfe2d6..27872ec 100644
--- a/platforms/testcd-root/post.inc.sh
+++ b/platforms/testcd-root/post.inc.sh
@@ -57,6 +57,11 @@ mkdir -p $MOUNTDIR/root/Desktop/
 cp $MOUNTDIR/usr/share/applications/openmamba-installer.desktop $MOUNTDIR/root/Desktop/
 cp $MOUNTDIR/usr/share/applications/openmamba-bootrecover.desktop $MOUNTDIR/root/Desktop/
 
+# configure favorites in kde menu
+for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do
+   chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
+done
+
 # prebuild postplug sound CARDID_DB (with some ugly trick to make it work from chroot)
 [ -e $MOUNTDIR/lib/modules/`uname -r` ] || ln -s ${KERNEL_MAJVER}${KERNEL_EXTRAVER} $MOUNTDIR/lib/modules/`uname -r`
 echo "SOUND_BUILD_CARDID_DB_ONLY=1 /etc/postplug/postplug.d/sound" >> $MOUNTDIR/tmp/sounddb.sh