diff --git a/science/q/Makefile b/science/q/Makefile
index 19152626bfc1..0d071722ae4c 100644
--- a/science/q/Makefile
+++ b/science/q/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	q
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Molecular Dynamics (MD) tools
 WWW=		https://github.com/qusers/Q6
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 USES=		fortran:gfortran gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	qusers
 GH_PROJECT=	Q6
 
 MAKEFILE=	makefile
 
 WRKSRC_SUBDIR=	src
 
 BINARY_ALIAS=	make=${GMAKE} gfortran=gfortran${GCC_DEFAULT}
 
 MAKE_JOBS_UNSAFE=	yes
 
 EXECUTABLES=	Qcalc6 Qdum6 Qdyn6 Qfep6 Qpi6 Qprep6
 
 PLIST_FILES=	${EXECUTABLES:C/(.*)/bin\/\1/}
 
 do-install:
 .for e in ${EXECUTABLES}
 	${INSTALL_PROGRAM} ${WRKSRC}/../bin/${e} ${STAGEDIR}${PREFIX}/bin
 .endfor
 
 .include <bsd.port.mk>
diff --git a/science/q/files/patch-qdyn.f90 b/science/q/files/patch-qdyn.f90
new file mode 100644
index 000000000000..ae4ad762277c
--- /dev/null
+++ b/science/q/files/patch-qdyn.f90
@@ -0,0 +1,38 @@
+--- qdyn.f90.orig	2026-07-21 05:13:28 UTC
++++ qdyn.f90
+@@ -218,29 +218,26 @@ end program Qdyn6
+ 
+ ! signal handlers
+ 
+-INTEGER(4) FUNCTION sigint_handler(sig_num)
++SUBROUTINE sigint_handler(sig_num)
+   use MD
+   implicit none
+   INTEGER(4)					:: sig_num
+ 
+   call die('user request (control-C)')
+-  sigint_handler = 1
+-END FUNCTION sigint_handler
++END SUBROUTINE sigint_handler
+ 
+-INTEGER(4) FUNCTION sigkill_handler(sig_num)
++SUBROUTINE sigkill_handler(sig_num)
+   use MD
+   implicit none
+   INTEGER(4)					:: sig_num
+ 
+   call die('kill signal')
+-  sigkill_handler = 1
+-END FUNCTION sigkill_handler
++END SUBROUTINE sigkill_handler
+ 
+-INTEGER(4) FUNCTION sigabrt_handler(sig_num)
++SUBROUTINE sigabrt_handler(sig_num)
+   use MD
+   implicit none
+   INTEGER(4)					:: sig_num
+ 
+   call die('kill signal')
+-  sigabrt_handler = 1
+-END FUNCTION sigabrt_handler
++END SUBROUTINE sigabrt_handler
diff --git a/science/q/files/patch-qpi.f90 b/science/q/files/patch-qpi.f90
new file mode 100644
index 000000000000..3eb6efb8c066
--- /dev/null
+++ b/science/q/files/patch-qpi.f90
@@ -0,0 +1,38 @@
+--- qpi.f90.orig	2017-11-19 12:13:54 UTC
++++ qpi.f90
+@@ -209,29 +209,26 @@ end program QPI6
+ 
+ ! signal handlers
+ 
+-INTEGER(4) FUNCTION sigint_handler(sig_num)
++SUBROUTINE sigint_handler(sig_num)
+   use QCP
+   implicit none
+   INTEGER(4)					:: sig_num
+ 
+   call die('user request (control-C)')
+-  sigint_handler = 1
+-END FUNCTION sigint_handler
++END SUBROUTINE sigint_handler
+ 
+-INTEGER(4) FUNCTION sigkill_handler(sig_num)
++SUBROUTINE sigkill_handler(sig_num)
+   use QCP
+   implicit none
+   INTEGER(4)					:: sig_num
+ 
+   call die('kill signal')
+-  sigkill_handler = 1
+-END FUNCTION sigkill_handler
++END SUBROUTINE sigkill_handler
+ 
+-INTEGER(4) FUNCTION sigabrt_handler(sig_num)
++SUBROUTINE sigabrt_handler(sig_num)
+   use QCP
+   implicit none
+   INTEGER(4)					:: sig_num
+ 
+   call die('kill signal')
+-  sigabrt_handler = 1
+-END FUNCTION sigabrt_handler
++END SUBROUTINE sigabrt_handler