diff --git a/platforms/livecd-root/settings.inc b/platforms/livecd-root/settings.inc
index ec396d9..8fb7c28 100644
--- a/platforms/livecd-root/settings.inc
+++ b/platforms/livecd-root/settings.inc
@@ -2,9 +2,16 @@ PRODUCT_NAME=livecd
 MEDIA=squash_xz
 MULTITHREAD=1
 
-KERNEL_EXTRAVER=mamba
-KERNEL_PLATFORM=""
-#KERNEL_ADDITIONAL="extramodules"
+if [ "$ARCH" = "i586" ]; then
+   KERNEL_EXTRAVER=mamba
+   KERNEL_PLATFORM=""
+   #KERNEL_ADDITIONAL="extramodules"
+   KERNEL_MORE_EXTRAVER=mamba-64GB
+elif [ "$ARCH" = "x86_64" ]; then
+   KERNEL_EXTRAVER=mamba-x86_64
+   KERNEL_PLATFORM=""
+   #KERNEL_ADDITIONAL="extramodules"
+fi
 
 TARGET_HOSTNAME=openmamba-livecd
 ROOTDEV=
diff --git a/platforms/livecd/settings.inc b/platforms/livecd/settings.inc
index dfb9289..71439e7 100644
--- a/platforms/livecd/settings.inc
+++ b/platforms/livecd/settings.inc
@@ -1,9 +1,15 @@
 MEDIA=iso
 MULTITHREAD=1
 DISTROMATIC=off
-KERNEL_EXTRAVER=mamba
-KERNEL_PLATFORM=""
-#KERNEL_ADDITIONAL="vboxvideo"
+if [ "$ARCH" = "i586" ]; then
+   KERNEL_EXTRAVER=mamba
+   KERNEL_PLATFORM=""
+   #KERNEL_ADDITIONAL="vboxvideo"
+elif [ "$ARCH" = "x86_64" ]; then
+   KERNEL_EXTRAVER=mamba-x86_64
+   KERNEL_PLATFORM=""
+   #KERNEL_ADDITIONAL="vboxvideo"   
+fi
 [ "$SUBPLATFORM" ] || {
    SUBPLATFORM="livecd-root"
    PRODUCT_NAME="livecd"