diff --git a/sysutils/flock/Makefile b/sysutils/flock/Makefile
index 00f013df6e35..9f9732972096 100644
--- a/sysutils/flock/Makefile
+++ b/sysutils/flock/Makefile
@@ -1,38 +1,39 @@
-# Created by: Andrey Zonov <andrey@zonov.org>
-
 PORTNAME=	flock
-PORTVERPREFIX=	2.30
-PORTVERSION=	${PORTVERPREFIX}.1
+PORTVERPREFIX=	2.37
+PORTVERSION=	${PORTVERPREFIX}.2
 CATEGORIES=	sysutils
 MASTER_SITES=	KERNEL_ORG/linux/utils/util-linux/v${PORTVERPREFIX}/
 DISTNAME=	util-linux-${PORTVERSION}
 
 MAINTAINER=	franco@opnsense.org
 COMMENT=	Manage locks from shell scripts
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-GNU_CONFIGURE=	yes
 USES=		libtool pkgconfig
 
-OPTIONS_DEFINE=	NLS
+GNU_CONFIGURE=	yes
 
-NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=	autoreconf gettext
+CFLAGS=		-D_WITH_CPU_SET_T
 
 PLIST_FILES=	bin/flock man/man1/flock.1.gz \
 		etc/bash_completion.d/flock
 
+OPTIONS_DEFINE=	NLS
+
+NLS_USES=	autoreconf gettext
+NLS_CONFIGURE_ENABLE=	nls
+
 do-build:
 	# skip building unneeded utils
 	${MAKE} -C ${WRKSRC} flock
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/flock ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/sys-utils/flock.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/bash-completion/flock ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 
 .include <bsd.port.mk>
diff --git a/sysutils/flock/distinfo b/sysutils/flock/distinfo
index cda29fb160bd..e570a67f7445 100644
--- a/sysutils/flock/distinfo
+++ b/sysutils/flock/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504499806
-SHA256 (util-linux-2.30.1.tar.gz) = 88bb1d08f0d67fb1b548c3e2160f7f40fb552cdf6b771a5dd1b94e1e04fc1d9a
-SIZE (util-linux-2.30.1.tar.gz) = 9513750
+TIMESTAMP = 1640072142
+SHA256 (util-linux-2.37.2.tar.gz) = 15db966474e459b33fa390a6b892190a92079a73ca45384cde4c86e6ed265a86
+SIZE (util-linux-2.37.2.tar.gz) = 12232498