diff --git a/Makefile.defs b/Makefile.defs
index 07171a3..d688ab1 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -117,7 +117,15 @@ ifeq ($(ARCH),arm)
 xorglibGL = libGL-Mesa-dri
 xorglibglx = xorg-ext-libglx
 xorgdrvvideo = xorg-drv-video-fbdev xf86-video-modesetting
-# xorg-drv-video-tegra
+libEGL.so = libraspberrypi
+libGLESv2.so = libraspberrypi
+endif
+
+ifeq ($(ARCH),aarch64)
+# xorg
+xorglibGL = libGL-Mesa-dri
+xorglibglx = xorg-ext-libglx
+xorgdrvvideo = xorg-drv-video-fbdev xf86-video-modesetting
 libEGL.so = libraspberrypi
 libGLESv2.so = libraspberrypi
 endif
diff --git a/platforms/rootfs-light/settings.inc b/platforms/rootfs-light/settings.inc
index 20a59e6..a94b304 100644
--- a/platforms/rootfs-light/settings.inc
+++ b/platforms/rootfs-light/settings.inc
@@ -4,6 +4,12 @@ if [ "$ARCH" = "arm" ]; then
    KERNEL_ADDITIONAL=""
    #KERNEL_IGNORE=true
    KERNEL_MORE_EXTRAVER=
+elif [ "$ARCH" = "aarch64" ]; then
+   KERNEL_EXTRAVER=mamba-aarch64
+   KERNEL_PLATFORM=""
+   KERNEL_ADDITIONAL=""
+   #KERNEL_IGNORE=true
+   KERNEL_MORE_EXTRAVER=
 elif [ "$ARCH" = "i586" ]; then
    KERNEL_EXTRAVER=mamba
    KERNEL_PLATFORM=""
diff --git a/platforms/rootfs/settings.inc b/platforms/rootfs/settings.inc
index 32a1131..082b11b 100644
--- a/platforms/rootfs/settings.inc
+++ b/platforms/rootfs/settings.inc
@@ -4,6 +4,12 @@ if [ "$ARCH" = "arm" ]; then
    KERNEL_ADDITIONAL=""
    #KERNEL_IGNORE=true
    KERNEL_MORE_EXTRAVER=
+elif [ "$ARCH" = "aarch64" ]; then
+   KERNEL_EXTRAVER=mamba-aarch64
+   #KERNEL_PLATFORM=""
+   KERNEL_ADDITIONAL=""
+   #KERNEL_IGNORE=true
+   KERNEL_MORE_EXTRAVER=
 elif [ "$ARCH" = "i586" ]; then
    KERNEL_EXTRAVER=mamba
    KERNEL_PLATFORM=""