diff --git a/science/siesta/Makefile b/science/siesta/Makefile
index f04bdb0a0215..7e07cff3291f 100644
--- a/science/siesta/Makefile
+++ b/science/siesta/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	siesta
-DISTVERSION=	4.0.2
-PORTREVISION=	3
+DISTVERSION=	4.1.5
 CATEGORIES=	science
-MASTER_SITES=	https://launchpad.net/${PORTNAME}/${DISTVERSION:R}/${DISTVERSION}/+download/
+MASTER_SITES=	https://gitlab.com/siesta-project/${PORTNAME}/-/releases/v${DISTVERSION}/downloads/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Program to perform efficient electronic structure calculations
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack
 
 USES=		fortran gmake localbase:ldflags
-GNU_CONFIGURE=	yes
-CONFIGURE_SCRIPT=	../Src/configure
+
 ALL_TARGET=	default
 
 WRKSRC_SUBDIR=	Obj
 
-MAKE_JOBS_UNSAFE=	yes
-
 PLIST_FILES=	bin/${PORTNAME}
 
+BINARY_ALIAS=	gfortran=gfortran${GCC_DEFAULT} gcc=gcc${GCC_DEFAULT}
+
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Type mismatch between actual argument at (1) and actual argument at (2) (COMPLEX(8)/REAL(8)).
-FCFLAGS+=	-fallow-argument-mismatch
+FFLAGS+=	-fallow-argument-mismatch
+MAKE_ARGS=	FFLAGS="${FFLAGS} -O2 -fPIC -ftree-vectorize"
 .endif
 
 pre-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} ../Src/obj_setup.sh
+	@cd ${WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ${SH} ../Src/obj_setup.sh && \
+		${LN} -s gfortran.make arch.make
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.post.mk>
diff --git a/science/siesta/distinfo b/science/siesta/distinfo
index 8a520fd4135f..ae18218c0c8c 100644
--- a/science/siesta/distinfo
+++ b/science/siesta/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535956967
-SHA256 (siesta-4.0.2.tar.gz) = bafbda19358f0c1dd39bb1253c92ee548791a1c0f648977051d2657216874f7e
-SIZE (siesta-4.0.2.tar.gz) = 9627717
+TIMESTAMP = 1619229947
+SHA256 (siesta-4.1.5.tar.gz) = 518df31aa6213af5e24cc73abb537b2c89a925b487171f5339d743d0c7140b3f
+SIZE (siesta-4.1.5.tar.gz) = 16286464
diff --git a/science/siesta/pkg-descr b/science/siesta/pkg-descr
index 7f1ae0f8577c..a903c4efae60 100644
--- a/science/siesta/pkg-descr
+++ b/science/siesta/pkg-descr
@@ -1,10 +1,10 @@
 SIESTA is both a method and its computer program implementation, to perform
 efficient electronic structure calculations and ab initio molecular dynamics
 simulations of molecules and solids. SIESTA's efficiency stems from the use of
 strictly localized basis sets and from the implementation of linear-scaling
 algorithms which can be applied to suitable systems. A very important feature
 of the code is that its accuracy and cost can be tuned in a wide range, from
 quick exploratory calculations to highly accurate simulations matching the
 quality of other approaches, such as plane-wave and all-electron methods.
 
-WWW: https://departments.icmab.es/leem/siesta/
+WWW: https://icmab.es/siesta