diff --git a/devel/py-opengrok-tools/Makefile b/devel/py-opengrok-tools/Makefile
index 7cce69a47215..51f152e4b146 100644
--- a/devel/py-opengrok-tools/Makefile
+++ b/devel/py-opengrok-tools/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	opengrok-tools
-PORTVERSION=		1.3.16
+PORTVERSION=		1.5.12
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	OpenGrok tools for synchronization and mirroring
 WWW=		https://oracle.github.io/opengrok/
 
 LICENSE=	CDDL
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=2.6.0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.20.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}resource>=0.2.0:devel/py-resource@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR}
 
 # According to the vendor, Python3 is required
 USES=		python
-USE_PYTHON=	autoplist distutils noflavors
-NO_ARCH=	yes
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	oracle
 GH_PROJECT=	opengrok
+USE_PYTHON=	autoplist distutils noflavors
+
+NO_ARCH=	yes
 
-BUILD_WRKSRC=	${WRKSRC}/opengrok-tools
+BUILD_WRKSRC=	${WRKSRC}/tools
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 .include <bsd.port.mk>
diff --git a/devel/py-opengrok-tools/distinfo b/devel/py-opengrok-tools/distinfo
index 52a587457179..535f8461ead0 100644
--- a/devel/py-opengrok-tools/distinfo
+++ b/devel/py-opengrok-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593116384
-SHA256 (oracle-opengrok-1.3.16_GH0.tar.gz) = 37669aafb96fc7ded83ca24a6e03213be197bb560605063f49b5d22ab9db6c03
-SIZE (oracle-opengrok-1.3.16_GH0.tar.gz) = 2039141
+TIMESTAMP = 1701690351
+SHA256 (oracle-opengrok-1.5.12_GH0.tar.gz) = a513dea831cecfa90e108957eb9461a8a09c1003b2877ff1c6c38e40113f3df6
+SIZE (oracle-opengrok-1.5.12_GH0.tar.gz) = 1962497
diff --git a/devel/py-opengrok-tools/files/patch-opengrok-tools_requirements.txt b/devel/py-opengrok-tools/files/patch-opengrok-tools_requirements.txt
deleted file mode 100644
index 4000bcc70ff7..000000000000
--- a/devel/py-opengrok-tools/files/patch-opengrok-tools_requirements.txt
+++ /dev/null
@@ -1,16 +0,0 @@
---- opengrok-tools/requirements.txt.orig	2020-03-26 19:43:15 UTC
-+++ opengrok-tools/requirements.txt
-@@ -3,11 +3,11 @@ chardet==3.0.4
- filelock==3.0.10
- idna==2.7
- JsonForm==0.0.2
--jsonschema==2.6.0
-+jsonschema>=2.6.0
- JsonSir==0.0.2
- Python-EasyConfig==0.1.7
- PyYAML==3.13
--requests==2.20.0
-+requests>=2.20.0
- Resource==0.2.1
- six==1.11.0
- urllib3==1.23
diff --git a/devel/py-opengrok-tools/files/patch-opengrok-tools_setup.py b/devel/py-opengrok-tools/files/patch-tools_setup.py
similarity index 66%
rename from devel/py-opengrok-tools/files/patch-opengrok-tools_setup.py
rename to devel/py-opengrok-tools/files/patch-tools_setup.py
index 7bcab4cba01f..3cc9f75daab0 100644
--- a/devel/py-opengrok-tools/files/patch-opengrok-tools_setup.py
+++ b/devel/py-opengrok-tools/files/patch-tools_setup.py
@@ -1,11 +1,11 @@
---- opengrok-tools/setup.py.orig	2020-03-26 19:43:15 UTC
-+++ opengrok-tools/setup.py
-@@ -32,7 +32,7 @@ setup(
+--- tools/setup.py.orig	2021-02-17 15:55:36 UTC
++++ tools/setup.py
+@@ -31,7 +31,7 @@ setup(
      long_description=readme(),
      python_requires='>=3.4, <4',
      install_requires=[
 -        'jsonschema==2.6.0',
 +        'jsonschema>=2.6.0',
          'pyyaml',
          'requests>=2.20.0',
          'resource',