diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 82015612366b..731e7eee6235 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,9 +1,9 @@
 # Created by: Hugo Saro <hugo@barafranca.com>
 
 PORTNAME=	haproxy
-DISTVERSION=	2.5.7
+DISTVERSION=	2.6.1
 CATEGORIES=	net www
-MASTER_SITES=	http://www.haproxy.org/download/2.5/src/
+MASTER_SITES=	http://www.haproxy.org/download/2.6/src/
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Reliable, high performance TCP/HTTP load balancer
@@ -21,7 +21,7 @@ default_CONFLICTS_INSTALL=	haproxy-lua
 lua_CONFLICTS_INSTALL=		haproxy
 lua_PKGNAMESUFFIX=		-lua
 
-CONFLICTS_INSTALL=	haproxy-devel haproxy17 haproxy18 haproxy20 haproxy22 haproxy23 haproxy24
+CONFLICTS_INSTALL=	haproxy-devel haproxy17 haproxy18 haproxy20 haproxy22 haproxy23 haproxy24 haproxy25
 
 ALL_TARGET=	all admin/halog/halog
 MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index f635fc68cdb0..897a85e3c33f 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1652454896
-SHA256 (haproxy-2.5.7.tar.gz) = e29f6334c6bdb521f63ddf335e2621bd2164503b99cf1f495b6f56ff9f3c164e
-SIZE (haproxy-2.5.7.tar.gz) = 3832801
+TIMESTAMP = 1656106022
+SHA256 (haproxy-2.6.1.tar.gz) = 915b351e6450d183342c4cdcda7771eac4f0f72bf90582adcd15a01c700d29b1
+SIZE (haproxy-2.6.1.tar.gz) = 3976025
diff --git a/net/haproxy/pkg-plist b/net/haproxy/pkg-plist
index 972a2a81d4c9..b919f519dccf 100644
--- a/net/haproxy/pkg-plist
+++ b/net/haproxy/pkg-plist
@@ -24,26 +24,28 @@ sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/how-it-works.txt
 %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http2.txt
 %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http_load_time.url
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/pool-debugging.txt
 %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/rate-shaping.txt
 %%PORTDOCS%%%%DOCSDIR%%/design-thoughts/sess_par_sec.txt
+%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/thread-group.txt
 %%PORTDOCS%%%%DOCSDIR%%/gpl.txt
 %%PORTDOCS%%%%DOCSDIR%%/haproxy.1
 %%PORTDOCS%%%%DOCSDIR%%/internals/acl.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/api/appctx.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/api/buffer-api.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/api/filters.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/api/htx-api.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/api/initcalls.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/api/ist.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/api/layers.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/api/list.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/api/pools.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/api/scheduler.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/body-parsing.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/connection-header.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/entities-v2.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/entities.fig
-%%PORTDOCS%%%%DOCSDIR%%/internals/entities.pdf
-%%PORTDOCS%%%%DOCSDIR%%/internals/entities.svg
 %%PORTDOCS%%%%DOCSDIR%%/internals/entities.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/fd-migration.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/hashing.txt
@@ -68,7 +70,6 @@ sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/internals/pattern.pdf
 %%PORTDOCS%%%%DOCSDIR%%/internals/polling-states.fig
 %%PORTDOCS%%%%DOCSDIR%%/internals/repartition-be-fe-fi.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/sequence.fig
 %%PORTDOCS%%%%DOCSDIR%%/internals/sched.fig
 %%PORTDOCS%%%%DOCSDIR%%/internals/sched.pdf
 %%PORTDOCS%%%%DOCSDIR%%/internals/sched.png
@@ -94,7 +95,6 @@ sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/queuing.fig
 %%PORTDOCS%%%%DOCSDIR%%/regression-testing.txt
 %%PORTDOCS%%%%DOCSDIR%%/seamless_reload.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl-content-sw.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic-config-edge.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/content-sw-sample.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/400.http