diff --git a/devel/oci-cli/Makefile b/devel/oci-cli/Makefile
index 9816d8c27513..1ae27019552b 100644
--- a/devel/oci-cli/Makefile
+++ b/devel/oci-cli/Makefile
@@ -1,39 +1,46 @@
 PORTNAME=	oci-cli
 DISTVERSION=	3.51.0
+# See below comment for WRKSRC
+DISTNAME=	${PORTNAME:S/-/_/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ale_sagra@hotmail.com
 COMMENT=	Command Line Interface for Oracle Cloud Infrastructure
 WWW=		https://github.com/oracle/oci-cli/
 
 LICENSE=	APACHE20 UPL
 LICENSE_COMB=	dual
 LICENSE_GROUPS_UPL=	FSF GPL OSI
 LICENSE_NAME_UPL=	Universal Permissive License
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE.txt
 LICENSE_FILE_UPL=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS_UPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}arrow>=1.0.0:devel/py-arrow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=8.0.4:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jmespath>=0.10.0:devel/py-jmespath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oci>=2.141.0:devel/py-oci@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=22.1.0:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.29:devel/py-prompt-toolkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.5.3:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.15.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}terminaltables>=3.1.0:textproc/py-terminaltables@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=5.4:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		python:3.8-3.11
 USE_PYTHON=	autoplist concurrent cryptography pep517
 
+# upstream uses underscore for the tarball name, but uses hyphen for
+# the directory name inside the tarball.
+# e.g. oci_cli-3.51.0.tar.gz vs oci-cli-3.51.0
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
+
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/oci-cli/distinfo b/devel/oci-cli/distinfo
index 26d08e6ec539..6bb20642f362 100644
--- a/devel/oci-cli/distinfo
+++ b/devel/oci-cli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734424153
-SHA256 (oci-cli-3.51.0.tar.gz) = 2c63aed7a738e891bf69612409ed5742e03ee06503e1d3399e44a9dee0c636bb
-SIZE (oci-cli-3.51.0.tar.gz) = 18282957
+TIMESTAMP = 1734595983
+SHA256 (oci_cli-3.51.0.tar.gz) = 2c63aed7a738e891bf69612409ed5742e03ee06503e1d3399e44a9dee0c636bb
+SIZE (oci_cli-3.51.0.tar.gz) = 18282957