diff -r 26b17a9d1ba2 sys/conf/files
--- a/sys/conf/files	Tue Mar 12 16:49:16 2019 -0700
+++ b/sys/conf/files	Thu Mar 14 10:27:35 2019 -0700
@@ -1466,8 +1466,8 @@ t4fw.fwo		optional cxgbe					\
 	no-implicit-rule						\
 	clean		"t4fw.fwo"
 t4fw.fw			optional cxgbe					\
-	dependency	"$S/dev/cxgbe/firmware/t4fw-1.23.0.0.bin.uu"	\
-	compile-with	"${NORMAL_FW}"					\
+	dependency	"$S/dev/cxgbe/firmware/t4fw-1.23.0.0.bin"	\
+	compile-with	"${CP} ${.ALLSRC} ${.TARGET}"			\
 	no-obj no-implicit-rule						\
 	clean		"t4fw.fw"
 t5fw_cfg.c		optional cxgbe					\
@@ -1500,8 +1500,8 @@ t5fw.fwo		optional cxgbe					\
 	no-implicit-rule						\
 	clean		"t5fw.fwo"
 t5fw.fw			optional cxgbe					\
-	dependency	"$S/dev/cxgbe/firmware/t5fw-1.23.0.0.bin.uu"	\
-	compile-with	"${NORMAL_FW}"					\
+	dependency	"$S/dev/cxgbe/firmware/t5fw-1.23.0.0.bin"	\
+	compile-with	"${CP} ${.ALLSRC} ${.TARGET}"			\
 	no-obj no-implicit-rule						\
 	clean		"t5fw.fw"
 t6fw_cfg.c		optional cxgbe					\
@@ -1534,8 +1534,8 @@ t6fw.fwo		optional cxgbe					\
 	no-implicit-rule						\
 	clean		"t6fw.fwo"
 t6fw.fw			optional cxgbe					\
-	dependency	"$S/dev/cxgbe/firmware/t6fw-1.23.0.0.bin.uu"	\
-	compile-with	"${NORMAL_FW}"					\
+	dependency	"$S/dev/cxgbe/firmware/t6fw-1.23.0.0.bin"	\
+	compile-with	"${CP} ${.ALLSRC} ${.TARGET}"			\
 	no-obj no-implicit-rule						\
 	clean		"t6fw.fw"
 dev/cxgbe/crypto/t4_crypto.c	optional ccr \
diff -r 26b17a9d1ba2 sys/modules/cxgbe/t4_firmware/Makefile
--- a/sys/modules/cxgbe/t4_firmware/Makefile	Tue Mar 12 16:49:16 2019 -0700
+++ b/sys/modules/cxgbe/t4_firmware/Makefile	Thu Mar 14 10:27:35 2019 -0700
@@ -18,10 +18,6 @@ FIRMWS+=	${F}:${F:C/.txt//}:1.0.0.0
 .endfor
 
 T4FW_VER=	1.23.0.0
-FIRMWS+=	t4fw.fw:t4fw:${T4FW_VER}
-CLEANFILES+=	t4fw.fw
-
-t4fw.fw: t4fw-${T4FW_VER}.bin.uu
-	uudecode -o ${.TARGET} ${.ALLSRC}
+FIRMWS+=	t4fw-1.23.0.0.bin:t4fw:${T4FW_VER}
 
 .include <bsd.kmod.mk>
diff -r 26b17a9d1ba2 sys/modules/cxgbe/t5_firmware/Makefile
--- a/sys/modules/cxgbe/t5_firmware/Makefile	Tue Mar 12 16:49:16 2019 -0700
+++ b/sys/modules/cxgbe/t5_firmware/Makefile	Thu Mar 14 10:27:35 2019 -0700
@@ -18,10 +18,6 @@ FIRMWS+=	${F}:${F:C/.txt//}:1.0.0.0
 .endfor
 
 T5FW_VER=	1.23.0.0
-FIRMWS+=	t5fw.fw:t5fw:${T5FW_VER}
-CLEANFILES+=	t5fw.fw
-
-t5fw.fw: t5fw-${T5FW_VER}.bin.uu
-	uudecode -o ${.TARGET} ${.ALLSRC}
+FIRMWS+=	t5fw-1.23.0.0.bin:t5fw:${T5FW_VER}
 
 .include <bsd.kmod.mk>
diff -r 26b17a9d1ba2 sys/modules/cxgbe/t6_firmware/Makefile
--- a/sys/modules/cxgbe/t6_firmware/Makefile	Tue Mar 12 16:49:16 2019 -0700
+++ b/sys/modules/cxgbe/t6_firmware/Makefile	Thu Mar 14 10:27:35 2019 -0700
@@ -18,10 +18,6 @@ FIRMWS+=	${F}:${F:C/.txt//}:1.0.0.0
 .endfor
 
 T6FW_VER=	1.23.0.0
-FIRMWS+=	t6fw.fw:t6fw:${T6FW_VER}
-CLEANFILES+=	t6fw.fw
-
-t6fw.fw: t6fw-${T6FW_VER}.bin.uu
-	uudecode -o ${.TARGET} ${.ALLSRC}
+FIRMWS+=	t6fw-1.23.0.0.bin:t6fw:${T6FW_VER}
 
 .include <bsd.kmod.mk>