:: commit 6f7d2f0b303dc1b7335c0ad9ef5142223fcf6d15

diff --git a/configure.ac b/configure.ac
index 5848d4d5..8499f54d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,15 +46,42 @@ rm -rf "$BUILDDIR/cross-files"
 BUILD_ALL="no"
 
 AC_ARG_ENABLE([all],
-    AS_HELP_STRING([--enable-all], [enable ALL ports]),
+    AS_HELP_STRING([--enable-all], [enable ALL options]),
     BUILD_ALL="$enableval")
 
+BUILD_CD="$BUILD_ALL"
+
+AC_ARG_ENABLE([bios-cd],
+    AS_HELP_STRING([--enable-bios-cd], [enable building the x86 BIOS CD image]),
+    BUILD_CD="$enableval")
+
+AC_SUBST(BUILD_CD)
+
+BUILD_PXE="$BUILD_ALL"
+
+AC_ARG_ENABLE([bios-pxe],
+    AS_HELP_STRING([--enable-bios-pxe], [enable building the x86 BIOS PXE image]),
+    BUILD_PXE="$enableval")
+
+AC_SUBST(BUILD_PXE)
+
 BUILD_BIOS="$BUILD_ALL"
 
 AC_ARG_ENABLE([bios],
     AS_HELP_STRING([--enable-bios], [enable building the x86 BIOS port]),
     BUILD_BIOS="$enableval")
 
+BUILD_LIMINE_DEPLOY="$BUILD_BIOS"
+
+if test "x$BUILD_BIOS" = "xno"; then
+    if test "x$BUILD_CD" = "xyes"; then
+        BUILD_BIOS="yes"
+    fi
+    if test "x$BUILD_PXE" = "xyes"; then
+        BUILD_BIOS="yes"
+    fi
+fi
+
 if test "x$BUILD_BIOS" = "xno"; then
     BUILD_BIOS=""
 else
@@ -69,31 +96,8 @@ else
 fi
 
 AC_SUBST(BUILD_BIOS)
-
-BUILD_LIMINE_DEPLOY="$BUILD_ALL"
-
-AC_ARG_ENABLE([limine-deploy],
-    AS_HELP_STRING([--enable-limine-deploy], [enable building limine-deploy]),
-    BUILD_LIMINE_DEPLOY="$enableval")
-
 AC_SUBST(BUILD_LIMINE_DEPLOY)
 
-BUILD_CD="$BUILD_ALL"
-
-AC_ARG_ENABLE([bios-cd],
-    AS_HELP_STRING([--enable-bios-cd], [enable building the x86 BIOS CD image]),
-    BUILD_CD="$enableval")
-
-AC_SUBST(BUILD_CD)
-
-BUILD_PXE="$BUILD_ALL"
-
-AC_ARG_ENABLE([bios-pxe],
-    AS_HELP_STRING([--enable-bios-pxe], [enable building the x86 BIOS PXE image]),
-    BUILD_PXE="$enableval")
-
-AC_SUBST(BUILD_PXE)
-
 BUILD_UEFI_IA32="$BUILD_ALL"
 
 AC_ARG_ENABLE([uefi-ia32],
@@ -136,8 +140,8 @@ AC_SUBST(BUILD_UEFI_X86_64)
 
 BUILD_CD_EFI="$BUILD_ALL"
 
-AC_ARG_ENABLE([cd-efi],
-    AS_HELP_STRING([--enable-cd-efi], [enable building limine-cd-efi.bin]),
+AC_ARG_ENABLE([uefi-cd],
+    AS_HELP_STRING([--enable-uefi-cd], [enable building limine-cd-efi.bin]),
     BUILD_CD_EFI="$enableval")
 
 if ! test "x$BUILD_CD_EFI" = "xno"; then