diff --git a/Mk/Uses/octave.mk b/Mk/Uses/octave.mk
index 1e634113899a..6145a96aa310 100644
--- a/Mk/Uses/octave.mk
+++ b/Mk/Uses/octave.mk
@@ -1,90 +1,90 @@
 # Support for octave based ports
 #
 # Feature: 		octave
 # Usage:		USES=octave
 # Valid ARGS:	(none), env
 # 	- env : Loads only one environmental variable OCTAVE_VERSION
 # MAINTAINER:	stephen@FreeBSD.org
 #
 # Common code to install octave-forge packages.
 # It is, in effect, a wrapper using the package handling already built
 # into math/octave.
 
 .if !defined(_INCLUDE_USES_OCTAVE_MK)
 _INCLUDE_USES_OCTAVE_MK=    yes
 
 _valid_octave_ARGS=		env
 
 # Sanity check
 .  for arg in ${octave_ARGS}
 .    if empty(_valid_octave_ARGS:M${arg})
 IGNORE=	Incorrect 'USES+= octave:${octave_ARGS}' usage: argument [${arg}] is not recognized
 .    endif
 .  endfor
 
-OCTAVE_VERSION=	9.3.0
+OCTAVE_VERSION=	9.4.0
 
 .  if empty(octave_ARGS:Menv)
 BUILD_DEPENDS+=	octave:math/octave
 RUN_DEPENDS+=	octave:math/octave \
 		${LOCALBASE}/libexec/octave/load-octave-pkg:math/octave-forge-base
 LIB_DEPENDS+=	libpcre.so:devel/pcre
 
 .    if ! ${USES:Mcompiler}
 _USES_POST+=	compiler:c++14-lang
 .    endif
 
 .    if ! ${USES:Mfortran}
 _USES_POST+=	fortran
 .    endif
 
 .    if ! ${USES:Mgmake}
 _USES_POST+=	gmake
 .    endif
 
 CXXFLAGS+=	-I${LOCALBASE}/include/octave-${OCTAVE_VERSION}
 CFLAGS+=	-I${LOCALBASE}/include/octave-${OCTAVE_VERSION}
 CPPFLAGS+=	-I${LOCALBASE}/include/octave-${OCTAVE_VERSION}
 
 DIST_SUBDIR?=	octave-forge
 OCTAVE_PKGNAME=	${PORTNAME:S/octave-forge-//}
 OCTAVE_DISTNAME=	${OCTAVE_PKGNAME}-${DISTVERSION}
 OCTAVE_TARBALLS_DIR=	${LOCALBASE}/share/octave/tarballs
 OCTAVE_INSTALL_TARBALLS_DIR=	${STAGEDIR}${PREFIX}/share/octave/tarballs
 OCTAVE_SRC?=	${DISTNAME}
 WRKSRC?=	${WRKDIR}/${OCTAVE_SRC}/src
 
 MAKE_ENV+=	PACKAGE=${OCTAVE_DISTNAME}.tar.gz
 MAKE_ARGS+=	CC="${CC}" CXX="${CXX}" LD_CXX="${CXX}" DL_LD="${CXX}" MKOCTFILE="${LOCALBASE}/bin/mkoctfile" OCTAVE_VERSION=-${OCTAVE_VERSION}
 
 LOAD_OCTAVE_PKG_CMD=	${LOCALBASE}/libexec/octave/load-octave-pkg
 
 .    if !target(pre-install)
 pre-install: octave-pre-install
 .    endif #	!target(pre-install)
 
 .    if !target(do-install)
 do-install: octave-do-install
 .    endif # !target(do-install)
 
 .    if !target(post-install)
 post-install: octave-post-install
 .    endif # !target(post-install)
 
 octave-pre-install:
 	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTAVE_SRC}
 
 octave-do-install:
 	${MKDIR} ${OCTAVE_INSTALL_TARBALLS_DIR}
 	${INSTALL_DATA} ${WRKDIR}/${OCTAVE_DISTNAME}.tar.gz ${OCTAVE_INSTALL_TARBALLS_DIR}/.
 	${LN} -s -f ${OCTAVE_DISTNAME}.tar.gz ${OCTAVE_INSTALL_TARBALLS_DIR}/${OCTAVE_PKGNAME}.tar.gz
 
 octave-post-install:
 	@${ECHO_CMD} "share/octave/tarballs/${OCTAVE_DISTNAME}.tar.gz" >> ${TMPPLIST}
 	@${ECHO_CMD} "share/octave/tarballs/${OCTAVE_PKGNAME}.tar.gz" >> ${TMPPLIST}
 	@${ECHO_CMD} "@postunexec if [ -x ${LOAD_OCTAVE_PKG_CMD} ]; then ${LOAD_OCTAVE_PKG_CMD}; fi" >> ${TMPPLIST}
 	@${ECHO_CMD} "@postexec if [ -x ${LOAD_OCTAVE_PKG_CMD} ]; then ${LOAD_OCTAVE_PKG_CMD}; fi" >> ${TMPPLIST}
 .  endif # empty(octave_ARGS:Menv)
 
 .endif # !defined(_INCLUDE_USES_OCTAVE_MK)
diff --git a/math/octave/Makefile b/math/octave/Makefile
index a9ab8ad57cb9..8e6e7a92541f 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,130 +1,129 @@
 PORTNAME=	octave
 PORTVERSION=	${OCTAVE_VERSION}
-PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	High-level interactive language for numerical computations
 WWW=		https://www.octave.org/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:devel/gperf \
 		${LOCALBASE}/bin/makeinfo:print/texinfo \
 		gnuplot:math/gnuplot \
 		gsed:textproc/gsed \
 		${LOCALBASE}/include/rapidjson/rapidjson.h:devel/rapidjson
 RUN_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo \
 		gnuplot:math/gnuplot \
 		gsed:textproc/gsed
 LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
 		libarpack.so:math/arpack-ng \
 		libcamd.so:math/suitesparse-camd \
 		libccolamd.so:math/suitesparse-ccolamd \
 		libcholmod.so:math/suitesparse-cholmod \
 		libcolamd.so:math/suitesparse-colamd \
 		libcurl.so:ftp/curl \
 		libcxsparse.so:math/suitesparse-cxsparse \
 		libdrm.so:graphics/libdrm \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libfltk.so:x11-toolkits/fltk \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libftgl.so:graphics/ftgl \
 		libgl2ps.so:print/gl2ps \
 		libglpk.so:math/glpk \
 		libGraphicsMagick.so:graphics/GraphicsMagick \
 		libhdf5.so:science/hdf5 \
 		libklu.so:math/suitesparse-klu \
 		libOSMesa.so:graphics/libosmesa \
 		libpcre.so:devel/pcre \
 		libportaudio.so:audio/portaudio \
 		libqhull_r.so:math/qhull \
 		libqrupdate.so:math/qrupdate \
 		libspqr.so:math/suitesparse-spqr \
 		libsuitesparseconfig.so:math/suitesparse-config \
 		libsundials_arkode.so:math/sundials \
 		libumfpack.so:math/suitesparse-umfpack
 
 USES=		charsetfix compiler:c++14-lang desktop-file-utils fortran gl \
 		gmake iconv libtool localbase:ldflags ncurses octave:env perl5 \
 		pkgconfig readline tar:xz xorg
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}/${PORTVERSION}
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 USE_QT=		base 5compat tools sqldriver-sqlite
 USE_XORG=	x11 xcursor xext xfixes xft xinerama xrender
 USE_GL=		gl glu
 
 GNU_HOST=	${ARCH}-portbld-freebsd${OSREL}
 PLIST_SUB=	GNU_HOST=${GNU_HOST} \
 		OCTAVE_VERSION=${OCTAVE_VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib/qt6
 CONFIGURE_ENV=	ac_cv_path_SED=${LOCALBASE}/bin/gsed \
 		ac_cv_type_max_align_t=yes \
 		GPERF="${LOCALBASE}/bin/gperf" \
 		JAVA_HOME=${JAVA_HOME} \
 		LRELEASE_QTVER=${LRELEASE} \
 		MAKEINFO=${LOCALBASE}/bin/makeinfo \
 		MKINFO=${LOCALBASE}/bin/makeinfo \
 		MOC_QTVER=${MOC} \
 		QCOLLECTIONGENERATOR_QTVER=${QCOLLECTIONGENERATOR} \
 		QHELPGENERATOR_QTVER=${QHELPGENERATOR} \
 		RCC_QTVER=${RCC} \
 		UIC_QTVER=${UIC} \
 		man1dir=${PREFIX}/share/man/man1
 
 CONFIGURE_ARGS=	--disable-jit \
 		--disable-openmp \
 		--enable-shared \
 		--host=${GNU_HOST} \
 		--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
 		--with-lapack="${LAPACKLIB}" \
 		--with-osmesa
 
 INFO=		octave liboctave
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	DOCS JAVA QT6
 
 OPTIONS_RADIO=		BLAS
 OPTIONS_RADIO_BLAS=	ATLAS NETLIB OPENBLAS
 OPTIONS_DEFAULT=	JAVA OPENBLAS QT6
 OPTIONS_SUB=		yes
 
 DOCS_CONFIGURE_ENABLE=	docs
 JAVA_CONFIGURE_ENABLE=	java
 QT6_CONFIGURE_WITH=	qscintilla qt=6
 
 QT6_LIB_DEPENDS=	libqscintilla2_qt6.so:devel/qscintilla2@qt6
 
 DOCS_USES=	tex
 DOCS_USE=	TEX=dvipsk:build,formats:build
 JAVA_USES=	java
 JAVA_CFLAGS=	-I${JAVA_HOME}/include/${OPSYS:tl}
 QT6_USES=	qt:6
 OPENBLAS_USES=	blaslapack:openblas
 NETLIB_USES=	blaslapack:netlib
 ATLAS_USES=	blaslapack:atlas
 
 BINARY_ALIAS=	sed=gsed
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in liboctave/liboctave.ps refcard/refcard-a4.ps \
 	refcard/refcard-legal.ps refcard/refcard-letter.ps interpreter/octave.ps
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${INFO_PATH}
 .for file in interpreter/octave.info liboctave/liboctave.info
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${PREFIX}/${INFO_PATH}
 .endfor
 
 check regression-test: build
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check)
 
 .include <bsd.port.mk>
diff --git a/math/octave/distinfo b/math/octave/distinfo
index a6c35b0edbff..2a24a2738085 100644
--- a/math/octave/distinfo
+++ b/math/octave/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734155188
-SHA256 (octave-9.3.0.tar.xz) = 712468513db7e13b76f28c4b82cdba7d6f3f634c836ddb27a7a8fe9d708145f3
-SIZE (octave-9.3.0.tar.xz) = 27667832
+TIMESTAMP = 1738987974
+SHA256 (octave-9.4.0.tar.xz) = fff911909ef79f95ba244dab5b8c1cb8c693a6c447d31deabb53994f17cb7b3d
+SIZE (octave-9.4.0.tar.xz) = 27658760