diff --git a/devel/apache-commons-daemon/Makefile b/devel/apache-commons-daemon/Makefile
index 1ab02ad7f0c8..a2b026a2a2af 100644
--- a/devel/apache-commons-daemon/Makefile
+++ b/devel/apache-commons-daemon/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	commons-daemon
 DISTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	https://archive.apache.org/dist/commons/daemon/source/:src \
 		https://archive.apache.org/dist/commons/daemon/binaries/:bin
 PKGNAMEPREFIX=	apache-
 DISTFILES=	${PORTNAME}-${DISTVERSION}-native-src${EXTRACT_SUFX}:src \
 		${PORTNAME}-${DISTVERSION}-bin${EXTRACT_SUFX}:bin
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Wrapper code to start/stop a Java application as a daemon
 WWW=		https://commons.apache.org/proper/commons-daemon/
 
 LICENSE=	APACHE20
 
 USES=		java
 JAVA_OS=	native
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-java=${JAVA_HOME}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}-native-src/unix
 WRKBIN=		${WRKDIR}/${DISTNAME}
 
 PLIST_FILES=	bin/jsvc ${JAVAJARDIR}/${PORTNAME}.jar
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/jsvc ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKBIN}/${DISTNAME}.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKBIN}/${PORTNAME}-${DISTVERSION}-javadoc.jar \
 			${STAGEDIR}${DOCSDIR}/${PORTNAME}-javadoc.jar
 
 .include <bsd.port.mk>
diff --git a/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c b/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c
index 8b2486ff416f..15f5dfe86db5 100644
--- a/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c
+++ b/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c
@@ -1,76 +1,112 @@
---- native/jsvc-unix.c.orig	2025-01-06 00:00:00 UTC
+--- native/jsvc-unix.c.orig	2025-12-11 12:00:00 UTC
 +++ native/jsvc-unix.c
-@@ -731,18 +731,13 @@ static int wait_child(arg_data *args, int pid)
+@@ -608,11 +608,12 @@ retry:
+                 return 122;
+             }
+         }
+-        lseek(fd, SEEK_SET, 0);
+-        pidf = fdopen(fd, "r+");
+-        fprintf(pidf, "%d\n", (int)getpid());
+-        fflush(pidf);
+-        fclose(pidf);
++        char buf[32];
++        int len = snprintf(buf, sizeof(buf), "%d\n", (int)getpid());
++        lseek(fd, 0, SEEK_SET);
++        ftruncate(fd, 0);
++        write(fd, buf, len);
++        fsync(fd);
+         if (lockf(fd, F_ULOCK, 0)) {
+             log_error("check_pid: Failed to unlock PID file [%s] with file descriptor [%d] after reading due to [%d]",
+                     args->pidf, fd, errno);
+@@ -673,7 +674,7 @@ static int get_pidf(arg_data *args, bool quiet)
+     int i;
+     char buff[80];
+ 
+-    fd = open(args->pidf, O_RDONLY, 0);
++    fd = open(args->pidf, O_RDWR, 0);
+     if (!quiet)
+         log_debug("get_pidf: %d in %s", fd, args->pidf);
+     if (fd < 0) {
+@@ -755,18 +756,13 @@ static int wait_child(arg_data *args, int pid)
   */
  static int wait_child(arg_data *args, int pid)
  {
 -    int count = 10;
 +    int count = args->wait;
      bool havejvm = false;
      int fd;
      char buff[80];
 -    int i, status, waittime;
 +    int i, status;
  
      log_debug("wait_child %d", pid);
 -    waittime = args->wait / 10;
 -    if (waittime > 10) {
 -        count = waittime;
 -        waittime = 10;
 -    }
      while (count > 0) {
          sleep(1);
          /* check if the controler is still running */
-@@ -781,7 +776,6 @@ static int wait_child(arg_data *args, int pid)
+@@ -778,7 +774,7 @@ static int wait_child(arg_data *args, int pid)
+         }
+ 
+         /* check if the pid file process exists */
+-        fd = open(args->pidf, O_RDONLY);
++        fd = open(args->pidf, O_RDWR);
+         if (fd < 0 && havejvm) {
+             /* something has gone wrong the JVM has stopped */
+             return 1;
+@@ -812,7 +808,6 @@ static int wait_child(arg_data *args, int pid)
                  }
              }
          }
 -        sleep(waittime);
          count--;
      }
      /* It takes more than the wait time to start,
-@@ -915,11 +909,11 @@ static int child(arg_data *args, home_data *data, uid_
+@@ -946,11 +941,11 @@ static int child(arg_data *args, home_data *data, uid_
      create_tmp_file(args);
      while (!stopping) {
  #if defined(OSD_POSIX)
 -        java_sleep(60);
 +        java_sleep(1);
          /* pause(); */
  #else
          /* pause() is not threadsafe */
 -        sleep(60);
 +        sleep(1);
  #endif
          if (doreopen) {
              doreopen = false;
-@@ -938,7 +932,7 @@ static int child(arg_data *args, home_data *data, uid_
+@@ -969,7 +964,7 @@ static int child(arg_data *args, home_data *data, uid_
          return 6;
  
      if (doreload == true)
 -        ret = 123;
 +        ret = 124;
      else
          ret = 0;
  
-@@ -1348,10 +1342,10 @@ static int run_controller(arg_data *args, home_data *d
+@@ -1385,10 +1380,10 @@ static int run_controller(arg_data *args, home_data *d
              if (args->vers != true && args->chck != true && status != 122)
                  remove_pid_file(args, pid);
  
 -            /* If the child got out with 123 he wants to be restarted */
 +            /* If the child got out with 123 or 124 he wants to be restarted */
              /* See java_abort123 (we use this return code to restart when the JVM aborts) */
              if (!stopping) {
 -                if (status == 123) {
 +                if (status == 123 || status == 124) {
                      if (args->restarts == 0) {
                          log_debug("Service failure, restarts disabled");
                          return 1;
-@@ -1363,7 +1357,7 @@ static int run_controller(arg_data *args, home_data *d
+@@ -1400,7 +1395,7 @@ static int run_controller(arg_data *args, home_data *d
                      log_debug("Reloading service");
                      restarts++;
                      /* prevent looping */
 -                    if (laststart + 60 > time(NULL)) {
 +                    if (status == 123 && laststart + 60 > time(NULL)) {
                          log_debug("Waiting 60 s to prevent looping");
                          sleep(60);
                      }