Index: stand/arm/uboot/Makefile
===================================================================
--- stand/arm/uboot/Makefile
+++ stand/arm/uboot/Makefile
@@ -7,6 +7,7 @@
 LOADER_NET_SUPPORT?=	yes
 LOADER_NFS_SUPPORT?=	yes
 LOADER_TFTP_SUPPORT?=	no
+LOADER_TFTP_DEFAULT?=	no
 LOADER_GZIP_SUPPORT?=	no
 LOADER_BZIP2_SUPPORT?=	no
 
Index: stand/common/dev_net.c
===================================================================
--- stand/common/dev_net.c
+++ stand/common/dev_net.c
@@ -380,7 +380,7 @@
  *
  * If an ip is set it returns it in network byte order.
  * The default scheme defined in the global netproto, if not set it defaults to
- * NFS.
+ * NFS, unless LOADER_TFTP_DEFAULT is defined.
  * It leaves just the pathname in the global rootpath.
  */
 uint32_t
@@ -404,7 +404,11 @@
 	ptr = rootpath;
 	/* Fallback for compatibility mode */
 	if (netproto == NET_NONE) {
+#ifdef LOADER_TFTP_DEFAULT
+		netproto = NET_TFTP;
+#else
 		netproto = NET_NFS;
+#endif
 		(void)strsep(&ptr, ":");
 		if (ptr != NULL) {
 			addr = inet_addr(rootpath);
Index: stand/i386/loader/Makefile
===================================================================
--- stand/i386/loader/Makefile
+++ stand/i386/loader/Makefile
@@ -5,6 +5,7 @@
 LOADER_NET_SUPPORT?=	yes
 LOADER_NFS_SUPPORT?=	yes
 LOADER_TFTP_SUPPORT?=	yes
+LOADER_TFTP_DEFAULT?=	no
 LOADER_CD9660_SUPPORT?=	yes
 LOADER_EXT2FS_SUPPORT?=	yes
 LOADER_MSDOS_SUPPORT?=	yes
Index: stand/loader.mk
===================================================================
--- stand/loader.mk
+++ stand/loader.mk
@@ -123,6 +123,9 @@
 .if ${LOADER_TFTP_SUPPORT:Uno} == "yes"
 CFLAGS+=	-DLOADER_TFTP_SUPPORT
 .endif
+.if ${LOADER_TFTP_DEFAULT:Uno} == "yes"
+CFLAGS+=	-DLOADER_TFTP_DEFAULT
+.endif
 
 # Partition support
 .if ${LOADER_GPT_SUPPORT:Uyes} == "yes"
Index: stand/mips/uboot/Makefile
===================================================================
--- stand/mips/uboot/Makefile
+++ stand/mips/uboot/Makefile
@@ -7,6 +7,7 @@
 LOADER_NET_SUPPORT?=	yes
 LOADER_NFS_SUPPORT?=	yes
 LOADER_TFTP_SUPPORT?=	no
+LOADER_TFTP_DEFAULT?=	no
 LOADER_GZIP_SUPPORT?=	no
 LOADER_BZIP2_SUPPORT?=	no
 
Index: stand/powerpc/kboot/Makefile
===================================================================
--- stand/powerpc/kboot/Makefile
+++ stand/powerpc/kboot/Makefile
@@ -7,6 +7,7 @@
 LOADER_NET_SUPPORT?=	yes
 LOADER_NFS_SUPPORT?=	yes
 LOADER_TFTP_SUPPORT?=	no
+LOADER_TFTP_DEFAULT?=	no
 LOADER_GZIP_SUPPORT?=	yes
 LOADER_BZIP2_SUPPORT?=	no
 
Index: stand/powerpc/ofw/Makefile
===================================================================
--- stand/powerpc/ofw/Makefile
+++ stand/powerpc/ofw/Makefile
@@ -7,6 +7,7 @@
 LOADER_NET_SUPPORT?=	yes
 LOADER_NFS_SUPPORT?=	yes
 LOADER_TFTP_SUPPORT?=	no
+LOADER_TFTP_DEFAULT?=	no
 LOADER_GZIP_SUPPORT?=	yes
 LOADER_BZIP2_SUPPORT?=	no
 
Index: stand/powerpc/uboot/Makefile
===================================================================
--- stand/powerpc/uboot/Makefile
+++ stand/powerpc/uboot/Makefile
@@ -6,6 +6,7 @@
 LOADER_NET_SUPPORT?=	yes
 LOADER_NFS_SUPPORT?=	yes
 LOADER_TFTP_SUPPORT?=	no
+LOADER_TFTP_DEFAULT?=	no
 LOADER_GZIP_SUPPORT?=	no
 LOADER_BZIP2_SUPPORT?=	no