diff -urNp haproxy-2.8.4/Makefile.orig haproxy-2.8.4/Makefile
--- haproxy-2.8.4/Makefile.orig	2023-11-17 19:06:06.000000000 +0100
+++ haproxy-2.8.4/Makefile	2023-11-25 14:17:43.519841809 +0100
@@ -587,8 +587,13 @@ endif
 ifneq ($(USE_OPENSSL),)
   # only preset these for the regular openssl
   ifeq ($(USE_OPENSSL_WOLFSSL),)
-    SSL_CFLAGS    := $(if $(SSL_INC),-I$(SSL_INC))
-    SSL_LDFLAGS   := $(if $(SSL_LIB),-L$(SSL_LIB)) -lssl -lcrypto
+    ifneq ($(USE_QUIC),)
+      SSL_CFLAGS    := $(if $(SSL_INC),-I$(SSL_INC)) $(shell pkg-config --cflags libcrypto-quic libssl-quic)
+      SSL_LDFLAGS   := $(if $(SSL_LIB),-L$(SSL_LIB)) $(shell pkg-config --libs libcrypto-quic libssl-quic)
+    else
+      SSL_CFLAGS    := $(if $(SSL_INC),-I$(SSL_INC)) $(shell pkg-config --cflags libcrypto libssl)
+      SSL_LDFLAGS   := $(if $(SSL_LIB),-L$(SSL_LIB)) $(shell pkg-config --libs libcrypto libssl)
+    endif
   endif
   USE_SSL         := $(if $(USE_SSL),$(USE_SSL),implicit)
   OPTIONS_OBJS += src/ssl_sock.o src/ssl_ckch.o src/ssl_sample.o src/ssl_crtlist.o src/cfgparse-ssl.o src/ssl_utils.o src/jwt.o src/ssl_ocsp.o
@@ -611,6 +616,9 @@ OPTIONS_OBJS += src/quic_conn.o src/mux_
                 src/qpack-dec.o src/hq_interop.o src/quic_stream.o         \
                 src/h3_stats.o src/qmux_http.o src/cfgparse-quic.o         \
                 src/cbuf.o src/quic_cc.o src/quic_cc_nocc.o
+HAPROXY_PROGRAM = haproxy-quic
+else
+HAPROXY_PROGRAM = haproxy-noquic
 endif
 
 ifneq ($(USE_QUIC_OPENSSL_COMPAT),)
@@ -909,7 +917,7 @@ all:
 	@echo
 	@exit 1
 else
-all: haproxy dev/flags/flags $(EXTRA)
+all: $(HAPROXY_PROGRAM) dev/flags/flags $(EXTRA)
 endif # obsolete targets
 endif # TARGET
 
@@ -999,10 +1007,10 @@ else
 .build_opts:
 endif # non-empty target
 
-haproxy: $(OPTIONS_OBJS) $(OBJS)
+$(HAPROXY_PROGRAM): $(OPTIONS_OBJS) $(OBJS)
 	$(cmd_LD) $(LDFLAGS) -o $@ $^ $(LDOPTS)
 
-objsize: haproxy
+objsize: $(HAPROXY_PROGRAM)
 	$(Q)objdump -t $^|grep ' g '|grep -F '.text'|awk '{print $$5 FS $$6}'|sort
 
 %.o:	%.c $(DEP)
@@ -1067,14 +1075,14 @@ install-doc:
 	done
 
 install-bin:
-	$(Q)for i in haproxy $(EXTRA); do \
+	$(Q)for i in $(HAPROXY_PROGRAM) $(EXTRA); do \
 		if ! [ -e "$$i" ]; then \
 			echo "Please run 'make' before 'make install'."; \
 			exit 1; \
 		fi; \
 	done
 	$(Q)$(INSTALL) -d "$(DESTDIR)$(SBINDIR)"
-	$(Q)$(INSTALL) haproxy $(EXTRA) "$(DESTDIR)$(SBINDIR)"
+	$(Q)$(INSTALL) $(HAPROXY_PROGRAM) $(EXTRA) "$(DESTDIR)$(SBINDIR)"
 
 install: install-bin install-man install-doc
 
@@ -1084,10 +1092,10 @@ uninstall:
 		rm -f "$(DESTDIR)$(DOCDIR)"/$$x.txt ; \
 	done
 	$(Q)-rmdir "$(DESTDIR)$(DOCDIR)"
-	$(Q)rm -f "$(DESTDIR)$(SBINDIR)"/haproxy
+	$(Q)rm -f "$(DESTDIR)$(SBINDIR)"/'$(HAPROXY_PROGRAM)'
 
 clean:
-	$(Q)rm -f *.[oas] src/*.[oas] haproxy test .build_opts .build_opts.new
+	$(Q)rm -f *.[oas] src/*.[oas] $(HAPROXY_PROGRAM) test .build_opts .build_opts.new
 	$(Q)for dir in . src dev/* admin/* addons/* include/* doc; do rm -f $$dir/*~ $$dir/*.rej $$dir/core; done
 	$(Q)rm -f haproxy-$(VERSION).tar.gz haproxy-$(VERSION)$(SUBVERS)$(EXTRAVERSION).tar.gz
 	$(Q)rm -f haproxy-$(VERSION) haproxy-$(VERSION)$(SUBVERS)$(EXTRAVERSION) nohup.out gmon.out