diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile
index 4103751cad88..ba25f7747973 100644
--- a/devel/ipython/Makefile
+++ b/devel/ipython/Makefile
@@ -1,44 +1,47 @@
 PORTNAME=	ipython
-PORTVERSION=	8.18.1
-PORTREVISION=	1
+PORTVERSION=	8.37.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Enhanced Interactive Python shell
 WWW=		https://ipython.org/ \
 		https://ipython.readthedocs.io/en/stable/ \
 		https://github.com/ipython/ipython
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING.rst
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=51.0.0:devel/py-setuptools@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61.2:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} \
 		${PY_EXCEPTIONGROUP} \
 		${PYTHON_PKGNAMEPREFIX}jedi>=0.16:devel/py-jedi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}matplotlib-inline>0:math/py-matplotlib-inline@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pexpect>=4.3:misc/py-pexpect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.41<3.1.0:devel/py-prompt-toolkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.4.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=2:databases/py-sqlite3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}stack-data>0:devel/py-stack-data@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}traitlets>=5:devel/py-traitlets@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}matplotlib-inline>0:math/py-matplotlib-inline@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}stack-data>=0:devel/py-stack-data@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}traitlets>=5.13.0:devel/py-traitlets@${PY_FLAVOR} \
 
 USES=		cpe python
 USE_PYTHON=	autoplist concurrent pep517
 
-CONFLICTS_INSTALL=	py*-ipython5
-
 NO_ARCH=	yes
 
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	EXAMPLES
 
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 31200
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.6:devel/py-typing-extensions@${PY_FLAVOR}
+.endif
+
 post-install-EXAMPLES-on:
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/ipython/distinfo b/devel/ipython/distinfo
index e531140a1942..f0ea2c1948b8 100644
--- a/devel/ipython/distinfo
+++ b/devel/ipython/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1701364506
-SHA256 (ipython-8.18.1.tar.gz) = ca6f079bb33457c66e233e4580ebfc4128855b4cf6370dddd73842a9563e8a27
-SIZE (ipython-8.18.1.tar.gz) = 5486330
+TIMESTAMP = 1766953608
+SHA256 (ipython-8.37.0.tar.gz) = ca815841e1a41a1e6b73a0b08f3038af9b2252564d01fc405356d34033012216
+SIZE (ipython-8.37.0.tar.gz) = 5606088
diff --git a/devel/ipython/files/patch-setupbase.py b/devel/ipython/files/patch-setupbase.py
index 088121bbd21f..584e2d522a11 100644
--- a/devel/ipython/files/patch-setupbase.py
+++ b/devel/ipython/files/patch-setupbase.py
@@ -1,19 +1,14 @@
---- setupbase.py.orig	2024-01-27 00:28:40 UTC
+--- setupbase.py.orig	2025-01-29 09:57:23 UTC
 +++ setupbase.py
-@@ -145,10 +145,7 @@ def find_data_files():
+@@ -93,10 +93,7 @@ def find_data_files():
      Just man pages at this point.
      """
  
 -    if "freebsd" in sys.platform:
--        manpagebase = pjoin('man', 'man1')
+-        manpagebase = Path("man") / "man1"
 -    else:
--        manpagebase = pjoin('share', 'man', 'man1')
-+    manpagebase = pjoin('share', 'man', 'man1')
+-        manpagebase = Path("share") / "man" / "man1"
++    manpagebase = Path("share") / "man" / "man1"
  
      # Simple file lists can be made by hand
-     manpages = [f for f in glob(pjoin('docs','man','*.1.gz')) if isfile(f)]
-@@ -346,4 +343,3 @@ def git_prebuild(pkg_dir, build_cmd=build_py):
-                 )
- 
-     return MyBuildPy
--
+     manpages = [f for f in Path("docs/man").glob("*.1.gz") if f.is_file()]