diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 84b3aeb5d..78705bdef 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -2028,6 +2028,15 @@ static size_t fcgi_strm_send_params(struct fcgi_conn *fconn, struct fcgi_strm *f
 				else {
 					if (isteq(p.n, ist("host")))
 						params.srv_name = p.v;
+					else if (isteq(p.n, ist("te"))) {
+						/* "te" may only be sent with "trailers" if this value
+						 * is present, otherwise it must be deleted.
+						 */
+						p.v = istist(p.v, ist("trailers"));
+						if (!isttest(p.v) || (p.v.len > 8 && p.v.ptr[8] != ','))
+							break;
+						p.v = ist("trailers");
+					}
 
 					/* Skip header if same name is used to add the server name */
 					if (fconn->proxy->server_id_hdr_name &&
diff --git a/src/mux_h1.c b/src/mux_h1.c
index a627f1985..47322cb3e 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -1974,6 +1974,15 @@ static size_t h1_process_mux(struct h1c *h1c, struct buffer *buf, size_t count)
 				          !(h1m->flags & H1_MF_RESP))) {
 					ws_key_found = 1;
 				}
+				else if (isteq(n, ist("te"))) {
+					/* "te" may only be sent with "trailers" if this value
+					 * is present, otherwise it must be deleted.
+					 */
+					v = istist(v, ist("trailers"));
+					if (!isttest(v) || (v.len > 8 && v.ptr[8] != ','))
+						goto skip_hdr;
+					v = ist("trailers");
+				}
 
 				/* Skip header if same name is used to add the server name */
 				if (!(h1m->flags & H1_MF_RESP) && h1c->px->server_id_hdr_name &&