diff --git a/science/simgrid/Makefile b/science/simgrid/Makefile
index db9fa7d63319..6198e8288cfd 100644
--- a/science/simgrid/Makefile
+++ b/science/simgrid/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	SimGrid
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.35
-PORTREVISION=	7
+DISTVERSION=	4.1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simulator of the behavior of large-scale distributed systems
-WWW=		https://simgrid.org/
+WWW=		https://simgrid.org/ \
+		https://github.com/simgrid/simgrid
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE-LGPL-2.1
 
 LIB_DEPENDS=	libboost_context.so:devel/boost-libs \
 		libcgraph.so:graphics/graphviz \
 		libevent.so:devel/libevent \
 		${LIB_DEPENDS_${ARCH}}
 
-USES=		cmake:testing compiler:c++14-lang perl5 python shebangfix
+USES=		cmake:testing compiler:c++14-lang fortran perl5 python shebangfix
 SHEBANG_FILES=	tools/simgrid_convert_TI_traces.py
 USE_LDCONFIG=	yes
 
 USE_GITLAB=	yes
 GL_SITE=	https://framagit.org/
 GL_ACCOUNT=	simgrid
 GL_PROJECT=	simgrid
 GL_TAGNAME=	d68e1c39ec0832cb2391aedd17a868c597dd399e
 
 CMAKE_OFF=	enable_python
 
 LDFLAGS+=	/usr/lib/liblzma.so # workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237919
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc
 CMAKE_ARGS+=	-Denable_lto:BOOL=OFF
 .endif
 
 # tests fail, see https://github.com/simgrid/simgrid/issues/384
 
 pre-test: # build tests
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} tests
 
 .include <bsd.port.mk>
diff --git a/science/simgrid/pkg-plist b/science/simgrid/pkg-plist
index 041e028aeeaa..fd53f7172316 100644
--- a/science/simgrid/pkg-plist
+++ b/science/simgrid/pkg-plist
@@ -1,129 +1,132 @@
 bin/graphicator
 bin/simgrid-mc
 bin/simgrid_convert_TI_traces
 bin/simgrid_update_xml
 bin/smpicc
 bin/smpicxx
 bin/smpirun
+bin/smpif90
+bin/smpiff
 bin/tesh
 include/simgrid/Exception.hpp
 include/simgrid/activity_set.h
 include/simgrid/actor.h
 include/simgrid/barrier.h
 include/simgrid/chrono.hpp
 include/simgrid/comm.h
 include/simgrid/cond.h
 include/simgrid/config.h
 include/simgrid/disk.h
 include/simgrid/engine.h
 include/simgrid/exec.h
 include/simgrid/forward.h
 include/simgrid/host.h
 include/simgrid/instr.h
 include/simgrid/kernel/ProfileBuilder.hpp
 include/simgrid/kernel/Timer.hpp
 include/simgrid/kernel/resource/Action.hpp
 include/simgrid/kernel/resource/Model.hpp
 include/simgrid/kernel/routing/ClusterZone.hpp
 include/simgrid/kernel/routing/DijkstraZone.hpp
 include/simgrid/kernel/routing/DragonflyZone.hpp
 include/simgrid/kernel/routing/EmptyZone.hpp
 include/simgrid/kernel/routing/FatTreeZone.hpp
 include/simgrid/kernel/routing/FloydZone.hpp
 include/simgrid/kernel/routing/FullZone.hpp
 include/simgrid/kernel/routing/NetPoint.hpp
 include/simgrid/kernel/routing/NetZoneImpl.hpp
 include/simgrid/kernel/routing/RoutedZone.hpp
 include/simgrid/kernel/routing/StarZone.hpp
 include/simgrid/kernel/routing/TorusZone.hpp
 include/simgrid/kernel/routing/VivaldiZone.hpp
 include/simgrid/kernel/routing/WifiZone.hpp
 include/simgrid/link.h
 include/simgrid/mailbox.h
 include/simgrid/modelchecker.h
 include/simgrid/mutex.h
 include/simgrid/plugins/ProducerConsumer.hpp
 include/simgrid/plugins/battery.hpp
 include/simgrid/plugins/chiller.hpp
 include/simgrid/plugins/dvfs.h
 include/simgrid/plugins/energy.h
 include/simgrid/plugins/file_system.h
 include/simgrid/plugins/jbod.hpp
 include/simgrid/plugins/live_migration.h
 include/simgrid/plugins/load.h
 include/simgrid/plugins/solar_panel.hpp
 include/simgrid/s4u.hpp
 include/simgrid/s4u/Activity.hpp
 include/simgrid/s4u/ActivitySet.hpp
 include/simgrid/s4u/Actor.hpp
 include/simgrid/s4u/Barrier.hpp
 include/simgrid/s4u/Comm.hpp
 include/simgrid/s4u/ConditionVariable.hpp
 include/simgrid/s4u/Disk.hpp
 include/simgrid/s4u/Engine.hpp
 include/simgrid/s4u/Exec.hpp
 include/simgrid/s4u/Host.hpp
 include/simgrid/s4u/Io.hpp
 include/simgrid/s4u/Link.hpp
 include/simgrid/s4u/Mailbox.hpp
 include/simgrid/s4u/Mess.hpp
 include/simgrid/s4u/MessageQueue.hpp
 include/simgrid/s4u/Mutex.hpp
 include/simgrid/s4u/NetZone.hpp
 include/simgrid/s4u/Semaphore.hpp
 include/simgrid/s4u/Task.hpp
 include/simgrid/s4u/VirtualMachine.hpp
 include/simgrid/semaphore.h
 include/simgrid/simix.hpp
 include/simgrid/version.h
 include/simgrid/vm.h
 include/simgrid/zone.h
 include/smpi/forward.hpp
 include/smpi/mpi.h
+include/smpi/mpi.mod
 include/smpi/mpif.h
 include/smpi/sampi.h
 include/smpi/smpi.h
 include/smpi/smpi_extended_traces.h
 include/smpi/smpi_extended_traces_fortran.h
 include/smpi/smpi_helpers.h
 include/smpi/smpi_helpers_internal.h
 include/xbt.h
 include/xbt/Extendable.hpp
 include/xbt/PropertyHolder.hpp
 include/xbt/asserts.h
 include/xbt/asserts.hpp
 include/xbt/backtrace.hpp
 include/xbt/base.h
 include/xbt/config.h
 include/xbt/config.hpp
 include/xbt/dict.h
 include/xbt/dynar.h
 include/xbt/ex.h
 include/xbt/file.hpp
 include/xbt/function_types.h
 include/xbt/functional.hpp
 include/xbt/graph.h
 include/xbt/log.h
 include/xbt/log.hpp
 include/xbt/mallocator.h
 include/xbt/misc.h
 include/xbt/module.h
 include/xbt/parmap.h
 include/xbt/parse_units.hpp
 include/xbt/promise.hpp
 include/xbt/random.hpp
 include/xbt/range.hpp
 include/xbt/replay.hpp
 include/xbt/signal.hpp
 include/xbt/str.h
 include/xbt/string.hpp
 include/xbt/sysdep.h
 include/xbt/system_error.hpp
 include/xbt/utility.hpp
 include/xbt/virtu.h
 include/xbt/xbt_os_time.h
 lib/libsimgrid.so
 lib/libsimgrid.so.3.35
 lib/simgrid/smpimain
 lib/simgrid/smpireplaymain
 libdata/pkgconfig/simgrid.pc