diff --git a/platforms/bootcd/settings.inc b/platforms/bootcd/settings.inc
index d260f2d..cbef2a7 100644
--- a/platforms/bootcd/settings.inc
+++ b/platforms/bootcd/settings.inc
@@ -2,9 +2,18 @@ MEDIA=iso
 MULTITHREAD=1
 DISTROMATIC=off
 
-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"
+   #KERNEL_MORE_EXTRAVER=
+fi
+
 LIVECD_TARGETS=""
 
 TARGET_HOSTNAME=openmamba-livecd
diff --git a/platforms/bootusb/settings.inc b/platforms/bootusb/settings.inc
index 9834c2c..63a6f2a 100644
--- a/platforms/bootusb/settings.inc
+++ b/platforms/bootusb/settings.inc
@@ -2,11 +2,17 @@ MEDIA=cpio
 MULTITHREAD=1
 DISTROMATIC=on
 
-KERNEL_EXTRAVER=mamba
-KERNEL_PLATFORM=""
-#KERNEL_ADDITIONAL="extramodules wireless sound"
-
-KERNEL_MORE_EXTRAVER=mamba-64GB
+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"
+   KERNEL_MORE_EXTRAVER=
+fi
 
 RPMEXTRAARGS="--excludedocs"