diff --git a/databases/pgpool-II-41/Makefile b/databases/pgpool-II-41/Makefile
index 43cd6dd75e2f..6a29cd2ee075 100644
--- a/databases/pgpool-II-41/Makefile
+++ b/databases/pgpool-II-41/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	pgpool-II
-PORTVERSION=	4.1.2
+PORTVERSION=	4.1.6
 CATEGORIES=	databases
 MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
 PKGNAMESUFFIX=	41
 
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Connection pool server for PostgreSQL
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 PORTSCOUT=	limit:^4.1.[0-9]*
 
 USES=		gmake libtool pgsql:9.6+
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-
 USE_RC_SUBR=	pgpool
+
+GNU_CONFIGURE=	yes
+
 CONFLICTS=	pgpool-II-[0-9]*
 
 PORTDOCS=	*
 
 PAM_DESC=	Build with PAM support
 SSL_DESC=	Build with OpenSSL support
 MEMCACHED_DESC =	Use memcached for in memory query cache
 
 OPTIONS_DEFINE=	DOCS SSL PAM MEMCACHED
 OPTIONS_DEFAULT=	SSL
 
 MEMCACHED_CONFIGURE_ON=	--with-memcached=${LOCALBASE}/include
 MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 
 PAM_CONFIGURE_ON=	--with-pam
 
 SSL_CONFIGURE_WITH=	openssl
 SSL_USES=		ssl
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/pgpool
 	${INSTALL_LIB} ${WRKSRC}/src/libs/pcp/.libs/libpcp.so.1.0.0 ${STAGEDIR}${PREFIX}/lib
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR} "-not -name Makefile.\*"
 .for f in AUTHORS ChangeLog NEWS TODO
 	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/databases/pgpool-II-41/distinfo b/databases/pgpool-II-41/distinfo
index db5e018fd150..fe02ee957ebe 100644
--- a/databases/pgpool-II-41/distinfo
+++ b/databases/pgpool-II-41/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594799375
-SHA256 (pgpool-II-4.1.2.tar.gz) = d13b587c1268fadb687adc1a2255cf573f9eaea511a9661955ceb7deb6821811
-SIZE (pgpool-II-4.1.2.tar.gz) = 4263292
+TIMESTAMP = 1620558382
+SHA256 (pgpool-II-4.1.6.tar.gz) = 9a94d92fbcbc33eb48814341faad0a19607f54ed174561f07846a143ab35c9e1
+SIZE (pgpool-II-4.1.6.tar.gz) = 4301444
diff --git a/databases/pgpool-II-41/pkg-plist b/databases/pgpool-II-41/pkg-plist
index 84c4614cf18c..f2d90af0724e 100644
--- a/databases/pgpool-II-41/pkg-plist
+++ b/databases/pgpool-II-41/pkg-plist
@@ -1,40 +1,40 @@
 bin/pcp_attach_node
 bin/pcp_detach_node
 bin/pcp_node_count
 bin/pcp_node_info
 bin/pcp_pool_status
 bin/pcp_proc_count
 bin/pcp_proc_info
 bin/pcp_promote_node
 bin/pcp_recovery_node
 bin/pcp_stop_pgpool
 bin/pcp_watchdog_info
 bin/pg_enc
 bin/pg_md5
 bin/pgpool
 bin/pgpool_setup
 bin/pgproto
 bin/watchdog_setup
 @sample etc/failover.sh.sample
 @sample etc/follow_master.sh.sample
 @sample etc/pcp.conf.sample
 @sample etc/pgpool.conf.sample
-@sample etc/pgpool.conf.sample-logical
-@sample etc/pgpool.conf.sample-master-slave
-@sample etc/pgpool.conf.sample-replication
-@sample etc/pgpool.conf.sample-stream
+etc/pgpool.conf.sample-logical
+etc/pgpool.conf.sample-master-slave
+etc/pgpool.conf.sample-replication
+etc/pgpool.conf.sample-stream
 @sample etc/pgpool_remote_start.sample
 @sample etc/pool_hba.conf.sample
 etc/recovery_1st_stage.sample
 etc/recovery_2nd_stage.sample
 include/libpcp_ext.h
 include/pcp.h
 include/pool_process_reporting.h
 include/pool_type.h
 lib/libpcp.a
 lib/libpcp.so
 lib/libpcp.so.1
 lib/libpcp.so.1.0.0
 %%DATADIR%%/insert_lock.sql
 %%DATADIR%%/pgpool.pam
 @dir /var/run/pgpool