diff --git a/WHENCE b/WHENCE
index b9d3d622..c0c2ab31 100644
--- a/WHENCE
+++ b/WHENCE
@@ -577,14 +577,14 @@ Driver: cxgb4 - Chelsio Terminator 4/5/6 1/10/25/40/100G Ethernet adapter
 
 File: cxgb4/t4fw-1.14.4.0.bin
 File: cxgb4/t4fw-1.15.37.0.bin
-File: cxgb4/t4fw-1.20.8.0.bin
-Link: cxgb4/t4fw.bin -> t4fw-1.20.8.0.bin
+File: cxgb4/t4fw-1.21.5.0.bin
+Link: cxgb4/t4fw.bin -> t4fw-1.21.5.0.bin
 File: cxgb4/t5fw-1.14.4.0.bin
 File: cxgb4/t5fw-1.15.37.0.bin
-File: cxgb4/t5fw-1.20.8.0.bin
-Link: cxgb4/t5fw.bin -> t5fw-1.20.8.0.bin
-File: cxgb4/t6fw-1.20.8.0.bin
-Link: cxgb4/t6fw.bin -> t6fw-1.20.8.0.bin
+File: cxgb4/t5fw-1.21.5.0.bin
+Link: cxgb4/t5fw.bin -> t5fw-1.21.5.0.bin
+File: cxgb4/t6fw-1.21.5.0.bin
+Link: cxgb4/t6fw.bin -> t6fw-1.21.5.0.bin
 File: cxgb4/aq1202_fw.cld
 File: cxgb4/bcm8483.bin
 
diff --git a/cxgb4/t4fw-1.20.8.0.bin b/cxgb4/t4fw-1.20.8.0.bin
deleted file mode 100644
index b1d7d5d2..00000000
Binary files a/cxgb4/t4fw-1.20.8.0.bin and /dev/null differ
diff --git a/cxgb4/t4fw-1.21.5.0.bin b/cxgb4/t4fw-1.21.5.0.bin
new file mode 100644
index 00000000..576626b1
Binary files /dev/null and b/cxgb4/t4fw-1.21.5.0.bin differ
diff --git a/cxgb4/t4fw.bin b/cxgb4/t4fw.bin
index 0961746d..b840b346 120000
--- a/cxgb4/t4fw.bin
+++ b/cxgb4/t4fw.bin
@@ -1 +1 @@
-t4fw-1.20.8.0.bin
\ No newline at end of file
+t4fw-1.21.5.0.bin
\ No newline at end of file
diff --git a/cxgb4/t5fw-1.20.8.0.bin b/cxgb4/t5fw-1.20.8.0.bin
deleted file mode 100644
index 73744148..00000000
Binary files a/cxgb4/t5fw-1.20.8.0.bin and /dev/null differ
diff --git a/cxgb4/t5fw-1.21.5.0.bin b/cxgb4/t5fw-1.21.5.0.bin
new file mode 100644
index 00000000..da3a6bad
Binary files /dev/null and b/cxgb4/t5fw-1.21.5.0.bin differ
diff --git a/cxgb4/t5fw.bin b/cxgb4/t5fw.bin
index b19ffee6..e27e4f3c 120000
--- a/cxgb4/t5fw.bin
+++ b/cxgb4/t5fw.bin
@@ -1 +1 @@
-t5fw-1.20.8.0.bin
\ No newline at end of file
+t5fw-1.21.5.0.bin
\ No newline at end of file
diff --git a/cxgb4/t6fw-1.20.8.0.bin b/cxgb4/t6fw-1.20.8.0.bin
deleted file mode 100644
index 7bcb8c8a..00000000
Binary files a/cxgb4/t6fw-1.20.8.0.bin and /dev/null differ
diff --git a/cxgb4/t6fw-1.21.5.0.bin b/cxgb4/t6fw-1.21.5.0.bin
new file mode 100644
index 00000000..1dc3f231
Binary files /dev/null and b/cxgb4/t6fw-1.21.5.0.bin differ
diff --git a/cxgb4/t6fw.bin b/cxgb4/t6fw.bin
index 67dceb56..1434bcfe 120000
--- a/cxgb4/t6fw.bin
+++ b/cxgb4/t6fw.bin
@@ -1 +1 @@
-t6fw-1.20.8.0.bin
\ No newline at end of file
+t6fw-1.21.5.0.bin
\ No newline at end of file