diff --git a/etc/Makefile b/etc/Makefile
index 02f0f782272b..b87c6374efd1 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.451 2021/09/25 08:54:30 maya Exp $
+#	$NetBSD: Makefile,v 1.452 2021/09/26 15:52:40 maya Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -368,16 +368,13 @@ install-etc-files: .PHONY .MAKE check_DESTDIR MAKEDEV
 #	Install var/db/obsolete set lists; this is performed by "make build"
 #
 OBSOLETE.dir=		${.OBJDIR}/obsolete.dir
-OBSOLETE.files=		base comp etc games man misc rescue text
+OBSOLETE.files=		base comp etc games gpufw man misc rescue text
 .if ${MKDEBUG} != "no"
 OBSOLETE.files+=	debug
 .endif
 .if ${MKDTB} != "no"
 OBSOLETE.files+=	dtb
 .endif
-.if ${MKGPUFIRMWARE} != "no"
-OBSOLETE.files+=	gpufw
-.endif
 .if ${MKKMOD} != "no"
 OBSOLETE.files+=	modules
 .endif
diff --git a/external/nvidia-firmware/Makefile b/external/nvidia-firmware/Makefile
index 56f5fe57a7bd..b87d65170257 100644
--- a/external/nvidia-firmware/Makefile
+++ b/external/nvidia-firmware/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2021/09/25 08:54:30 maya Exp $
+# $NetBSD: Makefile,v 1.5 2021/09/26 15:52:40 maya Exp $
 
 .include <bsd.own.mk>
 
-.if ${MKGPUFIRMWARE} != "no"
+.if ${MKNOUVEAUFIRMWARE} != "no"
 SUBDIR+=	gm20x
 .endif
 
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 1abe028e5c46..c85f67caeaab 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.417 2021/09/25 08:54:30 maya Exp $
+#	$NetBSD: bsd.README,v 1.418 2021/09/26 15:52:40 maya Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -218,10 +218,6 @@ MKFIRMWARE      If not "no", install the /libdata/firmware directory,
 		Default: yes on amd64, cobalt, evbarm evbmips, evbppc, hpcarm,
 		hppa, i386, mac68k, macppc, sandpoint, and sparc64, no elsewhere.
 
-MKGPUFIRMWARE	If not "no", install the /libdata/firmware directory,
-		which is necessary for GPU drivers.
-		Default: yes on amd64, i386, evbarm. No elsewhere.
-
 MKGCC		If "no", don't build gcc(1) or any of the GCC-related
 		libraries (libgcc, libobjc, libstdc++).
 		Default: yes
@@ -373,6 +369,10 @@ MKNLS		If "no", don't build or install the NLS files and locale
 		definition files.
 		Default: yes
 
+MKNOUVEAUFIRMWARE If "yes", install the /libdata/firmware/nouveau directory,
+		which is necessary for the nouveau DRM driver.
+		Default: yes on amd64 and i386, no elsewhere.
+
 MKNPF		If "no", don't build or install the NPF and its modules.
 		Default: yes
 
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index e903fd4e0842..4c1618589a5f 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1261 2021/09/25 08:54:30 maya Exp $
+#	$NetBSD: bsd.own.mk,v 1.1262 2021/09/26 15:52:40 maya Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1236,9 +1236,12 @@ MKFIRMWARE.sandpoint=		yes
 MKFIRMWARE.sparc64=		yes
 
 # Only install the GPU firmware on DRM-happy systems.
-MKGPUFIRMWARE.x86_64=		yes
-MKGPUFIRMWARE.i386=		yes
-MKGPUFIRMWARE.aarch64=		yes
+MKNOUVEAUFIRMWARE.x86_64=	yes
+MKNOUVEAUFIRMWARE.i386=		yes
+MKNOUVEAUFIRMWARE.aarch64=	yes
+MKRADEONFIRMWARE.x86_64=	yes
+MKRADEONFIRMWARE.i386=		yes
+MKRADEONFIRMWARE.aarch64=	yes
 
 # Only install the tegra firmware on evbarm.
 MKTEGRAFIRMWARE.evbarm=		yes
@@ -1288,9 +1291,10 @@ _MKVARS.no= \
 	MKKYUA \
 	MKLIBCXX MKLLD MKLLDB MKLLVM MKLLVMRT MKLINT \
 	MKMANZ MKMCLINKER \
-	MKNSD MKOBJDIRS \
+	MKNOUVEAUFIRMWARE MKNSD \
+	MKOBJDIRS \
 	MKPCC MKPICINSTALL MKPIGZGZIP \
-	MKGPUFIRMWARE MKREPRO \
+	MKRADEONFIRMWARE MKREPRO \
 	MKSLJIT MKSOFTFLOAT MKSTRIPIDENT \
 	MKTEGRAFIRMWARE MKTPM \
 	MKUNPRIVED MKUPDATE \
diff --git a/sys/dev/microcode/radeon/Makefile b/sys/dev/microcode/radeon/Makefile
index fbda5597839d..fbb513cf3a1a 100644
--- a/sys/dev/microcode/radeon/Makefile
+++ b/sys/dev/microcode/radeon/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.7 2021/09/25 08:54:31 maya Exp $
+#	$NetBSD: Makefile,v 1.8 2021/09/26 15:52:40 maya Exp $
 
 NOMAN=	# defined
 
 .include <bsd.own.mk>
 
-.if ${MKGPUFIRMWARE} != "no"
+.if ${MKRADEONFIRMWARE} != "no"
 
 FILES=	\
 	R100_cp.bin \
diff --git a/usr.sbin/sysinst/Makefile.inc b/usr.sbin/sysinst/Makefile.inc
index a164ca571f51..44fc9f572590 100644
--- a/usr.sbin/sysinst/Makefile.inc
+++ b/usr.sbin/sysinst/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.42 2021/09/25 08:54:31 maya Exp $
+#	$NetBSD: Makefile.inc,v 1.43 2021/09/26 15:52:40 maya Exp $
 #
 # Makefile for sysinst
 
@@ -81,10 +81,6 @@ CPPFLAGS+=	-DUSING_PAXASTAR
 CPPFLAGS+=	-DHAVE_DTB
 .endif
 
-.if ${MKGPUFIRMWARE:Uno} != "no"
-CPPFLAGS+=	-DHAVE_GPUFW
-.endif
-
 .if ${MKKMOD:Uno} != "no"
 CPPFLAGS+=	-DHAVE_MODULES
 .endif
diff --git a/usr.sbin/sysinst/defs.h b/usr.sbin/sysinst/defs.h
index dd99111db111..ced045ec8c5b 100644
--- a/usr.sbin/sysinst/defs.h
+++ b/usr.sbin/sysinst/defs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: defs.h,v 1.73 2021/09/25 08:54:31 maya Exp $	*/
+/*	$NetBSD: defs.h,v 1.74 2021/09/26 15:52:40 maya Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -196,12 +196,7 @@ enum {
 #else
 #define	WITH_DTB
 #endif
-#ifdef HAVE_GPUFW
-#define	WITH_GPUFW	SET_GPUFW,
-#else
-#define	WITH_GPUFW
-#endif
-#define SET_CORE WITH_MODULES SET_BASE, WITH_DTB WITH_GPUFW SET_ETC
+#define SET_CORE WITH_MODULES SET_BASE, WITH_DTB SET_GPUFW, SET_ETC
 /* All system sets */
 #define SET_SYSTEM SET_CORE, SET_COMPILER, SET_GAMES, \
 		    SET_MAN_PAGES, SET_MISC, SET_RESCUE, \
diff --git a/usr.sbin/sysinst/util.c b/usr.sbin/sysinst/util.c
index 61ed10452e2a..43ed6bb77627 100644
--- a/usr.sbin/sysinst/util.c
+++ b/usr.sbin/sysinst/util.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.c,v 1.60 2021/09/25 08:54:31 maya Exp $	*/
+/*	$NetBSD: util.c,v 1.61 2021/09/26 15:52:40 maya Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -128,9 +128,7 @@ distinfo dist_list[] = {
 	{"etc",			SET_ETC,		false, MSG_set_system, NULL},
 	{"comp",		SET_COMPILER,		false, MSG_set_compiler, NULL},
 	{"games",		SET_GAMES,		false, MSG_set_games, NULL},
-#ifdef HAVE_GPUFW
 	{"gpufw",		SET_GPUFW,		false, MSG_set_gpufw, NULL},
-#endif
 	{"man",			SET_MAN_PAGES,		false, MSG_set_man_pages, NULL},
 	{"misc",		SET_MISC,		false, MSG_set_misc, NULL},
 	{"rescue",		SET_RESCUE,		false, MSG_set_rescue, NULL},