diff --git a/science/octopus/Makefile b/science/octopus/Makefile
index 402dd3d580a5..cd8c418b00a5 100644
--- a/science/octopus/Makefile
+++ b/science/octopus/Makefile
@@ -1,65 +1,64 @@
 PORTNAME=	octopus
-DISTVERSION=	11.3
-PORTREVISION=	1
+DISTVERSION=	11.4
 CATEGORIES=	science
 MASTER_SITES=	https://octopus-code.org/download/${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scientific program aimed at the ab initio virtual experimentation
 
 LICENSE=	GPLv2
 
 BROKEN_aarch64=	undefined reference to `__aarch64_cas8_acq_rel' #'
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libblas.so:math/blas \
 		libfftw3.so:math/fftw3 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgd.so:graphics/gd \
 		libgmp.so:math/gmp \
 		libgsl.so:math/gsl \
 		liblapack.so:math/lapack \
 		libmpfr.so:math/mpfr \
 		libnlopt.so:math/nlopt \
 		libpng.so:graphics/png \
 		libsymspg.so:science/spglib \
 		libtiff.so:graphics/tiff \
 		libvdwxcfort.so:science/libvdwxc \
 		libwebp.so:graphics/webp \
 		libxc.so:science/libxc \
 		libyaml.so:textproc/libyaml
 
-USES=		compiler:c++11-lang fortran gmake jpeg libtool localbase:ldflags perl5 python shebangfix
-USE_CXXSTD=	c++11
+USES=		compiler:c++14-lang fortran gmake jpeg libtool localbase:ldflags perl5 python shebangfix
+USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	src/fdep/fortran_dependencies.pl testsuite/performance/create_combinations.py
 
 GNU_CONFIGURE=	yes
 CONFIGURE_SHELL=	${PREFIX}/bin/bash
 CONFIGURE_ARGS=	--enable-shared --disable-static
 
 LDFLAGS+=	-lsymspg
 FCFLAGS+=	-I${LOCALBASE}/include -ffree-line-length-none
 
 INSTALL_TARGET=	install-strip
-TEST_TARGET=	check-short # some tests fail
+TEST_TARGET=	check-short # some tests fail, see https://gitlab.com/octopus-code/octopus/-/issues/558
 
 OPTIONS_DEFINE=			OPENMP
 OPTIONS_DEFAULT=		OPENMP
 OPENMP_CONFIGURE_ENABLE=	openmp
 
 .include <bsd.port.pre.mk>
 
 # workaround for:
 # Error: BOZ literal constant at (1) is neither a data-stmt-constant nor an actual argument to INT, REAL, DBLE, or CMPLX intrinsic function [see '-fno-allow-invalid-boz']
 .if ${GCC_DEFAULT} >= 10
 FCFLAGS+=	-fallow-argument-mismatch -fallow-invalid-boz
 .endif
 
 post-stage: # https://gitlab.com/octopus-code/octopus/issues/108
 	@${RM} ${STAGEDIR}${PREFIX}/include/yaml.h
 
 .include <bsd.port.post.mk>
diff --git a/science/octopus/distinfo b/science/octopus/distinfo
index 26109c9e7d3f..f03711b03cd7 100644
--- a/science/octopus/distinfo
+++ b/science/octopus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641425551
-SHA256 (octopus-11.3.tar.gz) = 0c98417071b5e38ba6cbdd409adf917837c387a010e321c0a7f94d9bd9478930
-SIZE (octopus-11.3.tar.gz) = 51465860
+TIMESTAMP = 1653983494
+SHA256 (octopus-11.4.tar.gz) = 73bb872bff8165ddd8efc5b891f767cb3fe575b5a4b518416c834450a4492da7
+SIZE (octopus-11.4.tar.gz) = 51465556
diff --git a/science/octopus/files/patch-testsuite_oct-run__testsuite.sh.in b/science/octopus/files/patch-testsuite_oct-run__testsuite.sh.in
deleted file mode 100644
index 11d7827d709c..000000000000
--- a/science/octopus/files/patch-testsuite_oct-run__testsuite.sh.in
+++ /dev/null
@@ -1,13 +0,0 @@
-- backport of https://gitlab.com/octopus-code/octopus/-/merge_requests/1598
-
---- testsuite/oct-run_testsuite.sh.in.orig	2022-01-06 16:59:24 UTC
-+++ testsuite/oct-run_testsuite.sh.in
-@@ -141,7 +141,7 @@ function checkqueue {
-                 break;
-             fi
-         done
--        sleep 0.1s;
-+        sleep 0.1;
-     done
- 
-     logfile=`basename $test_name .test`.log