diff --git a/src/config/defaults/efi.h b/src/config/defaults/efi.h
index 889d09c00..7899c160c 100644
--- a/src/config/defaults/efi.h
+++ b/src/config/defaults/efi.h
@@ -30,9 +30,6 @@ FILE_SECBOOT ( PERMITTED );
 #define NAP_EFI
 #define SERIAL_SPCR
 
-#define	NET_PROTO_IPV6		/* IPv6 protocol */
-#define	NET_PROTO_LLDP		/* Link Layer Discovery protocol */
-
 #define DOWNLOAD_PROTO_FILE	/* Local filesystem access */
 
 #define	SANBOOT_PROTO_ISCSI	/* iSCSI protocol */
diff --git a/src/config/general.h b/src/config/general.h
index 60b45ec35..3cafaa574 100644
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -30,18 +30,26 @@ FILE_SECBOOT ( PERMITTED );
 #define BANNER_TIMEOUT		20
 #define ROM_BANNER_TIMEOUT	( 2 * BANNER_TIMEOUT )
 
-/*
+/*****************************************************************************
+ *
  * Network protocols
  *
  */
 
-#define	NET_PROTO_IPV4		/* IPv4 protocol */
-//#define NET_PROTO_IPV6	/* IPv6 protocol */
-#undef	NET_PROTO_FCOE		/* Fibre Channel over Ethernet protocol */
-#define	NET_PROTO_STP		/* Spanning Tree protocol */
-#define	NET_PROTO_LACP		/* Link Aggregation control protocol */
-#define	NET_PROTO_EAPOL		/* EAP over LAN protocol */
-//#define NET_PROTO_LLDP	/* Link Layer Discovery protocol */
+/* Protocols supported on all platforms */
+#define NET_PROTO_EAPOL		/* EAP over LAN protocol */
+//#define NET_PROTO_FCOE	/* Fibre Channel over Ethernet protocol */
+#define NET_PROTO_IPV4		/* IPv4 protocol */
+#define NET_PROTO_IPV6		/* IPv6 protocol */
+#define NET_PROTO_LACP		/* Link Aggregation control protocol */
+#define NET_PROTO_LLDP		/* Link Layer Discovery protocol */
+#define NET_PROTO_STP		/* Spanning Tree protocol */
+
+/* Disable protocols not historically included in 32-bit BIOS builds */
+#if defined ( PLATFORM_pcbios ) && ! defined ( __x86_64__ )
+  #undef NET_PROTO_IPV6
+  #undef NET_PROTO_LLDP
+#endif
 
 /*
  * PXE support