diff --git a/misc/py-haystack_ai/Makefile b/misc/py-haystack_ai/Makefile
index 5e2cf52b2b1e..704c686e80ba 100644
--- a/misc/py-haystack_ai/Makefile
+++ b/misc/py-haystack_ai/Makefile
@@ -1,35 +1,40 @@
 PORTNAME=	haystack_ai
-PORTVERSION=	2.18.1
-PORTREVISION=	2
+PORTVERSION=	2.31.0
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	otis@FreeBSD.org
 COMMENT=	End-to-end LLM framework
 WWW=		https://github.com/deepset-ai/haystack
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tenacity>0:devel/py-tenacity@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lazy_imports>0:devel/py-lazy_imports@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}openai>0:misc/py-openai@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pydantic2>0:devel/py-pydantic2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}posthog>0:misc/py-posthog@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}filetype>0:devel/py-filetype@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docstring_parser>=0:textproc/py-docstring_parser@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}filetype>=0:devel/py-filetype@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}httpx>=0:www/py-httpx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lazy_imports>=0:devel/py-lazy_imports@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}more-itertools>=0:devel/py-more-itertools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}networkx>=0:math/py-networkx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}openai>=1.99.2:misc/py-openai@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}posthog>=3.12.0:misc/py-posthog@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pydantic2>=0:devel/py-pydantic2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-dateutil>=0:devel/py-python-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tenacity>=8.4.0:devel/py-tenacity@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tqdm>=0:misc/py-tqdm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.7:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
+NO_ARCH=	yes
+
+post-extract:
+	@${REINPLACE_CMD} -e 's/^license = "\([^"]*\)"/license = {text = "\1"}/' -e '/^license-files/d' ${WRKSRC}/pyproject.toml
 
 .include <bsd.port.mk>
diff --git a/misc/py-haystack_ai/distinfo b/misc/py-haystack_ai/distinfo
index efc1aba04d3e..998d94a1ef13 100644
--- a/misc/py-haystack_ai/distinfo
+++ b/misc/py-haystack_ai/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1760378404
-SHA256 (haystack_ai-2.18.1.tar.gz) = e734369ae5064b4f1647f1001e1a28584955be08df673a32cd36877126dbcc77
-SIZE (haystack_ai-2.18.1.tar.gz) = 403143
+TIMESTAMP = 1783543636
+SHA256 (haystack_ai-2.31.0.tar.gz) = e9fc0ae5d651bd2d92b54f08cd77ed501dbbdbaf0c7abc1d4392ebe2f01d3332
+SIZE (haystack_ai-2.31.0.tar.gz) = 510990