diff --git a/sysutils/dd_rescue/Makefile b/sysutils/dd_rescue/Makefile
index 700324a3ae6d..f5c1f6ca6dba 100644
--- a/sysutils/dd_rescue/Makefile
+++ b/sysutils/dd_rescue/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	dd_rescue
-PORTVERSION=	1.99.14
+PORTVERSION=	1.99.22
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.garloff.de/kurt/linux/ddrescue/ \
 		http://fossies.org/unix/privat/
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	dd tool suitable for rescuing data from a medium with errors
 WWW=		http://www.garloff.de/kurt/linux/ddrescue/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=		Fails to link: undefined reference to find_nonzero_arm8
 
 LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 
 USES=		autoreconf gmake ssl tar:bzip2
 USE_CSTD=	gnu89
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	default
 MAKE_ARGS=	EXTRA_LDFLAGS=-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include -Wno-int-conversion
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dd_rescue ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/libddr_crypt.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_PROGRAM} ${WRKSRC}/libddr_hash.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_PROGRAM} ${WRKSRC}/libddr_null.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_PROGRAM} ${WRKSRC}/libddr_lzo.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_MAN} ${WRKSRC}/dd_rescue.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_MAN} ${WRKSRC}/ddr_crypt.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_MAN} ${WRKSRC}/ddr_lzo.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA}	${WRKSRC}/README.dd_rescue ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/dd_rescue/distinfo b/sysutils/dd_rescue/distinfo
index d274b21b275d..1c33e23a8a2e 100644
--- a/sysutils/dd_rescue/distinfo
+++ b/sysutils/dd_rescue/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1724579114
-SHA256 (dd_rescue-1.99.14.tar.bz2) = 53a0a7f166ca74a146c137cb3dcfef320cf6c5e0f43208a75563b7c1db04d814
-SIZE (dd_rescue-1.99.14.tar.bz2) = 188613
+TIMESTAMP = 1784452207
+SHA256 (dd_rescue-1.99.22.tar.bz2) = c15fbfce24a2bf316b5ae795d891f84e7e5ddb583ba2886a55387f40ae767041
+SIZE (dd_rescue-1.99.22.tar.bz2) = 215361
diff --git a/sysutils/dd_rescue/files/patch-Makefile b/sysutils/dd_rescue/files/patch-Makefile
index 1fd8aa00ce5a..d3d6e8eabc5f 100644
--- a/sysutils/dd_rescue/files/patch-Makefile
+++ b/sysutils/dd_rescue/files/patch-Makefile
@@ -1,63 +1,63 @@
---- Makefile.orig	2024-08-22 17:41:01 UTC
+--- Makefile.orig	2025-12-07 17:50:24 UTC
 +++ Makefile
-@@ -7,11 +7,7 @@ SRCDIR ?= .
- DESTDIR = 
- SRCDIR ?= .
+@@ -7,11 +7,7 @@ SRCDIR ?= $(dir $(THISMKFILE))
+ THISMKFILE := $(lastword $(MAKEFILE_LIST))
+ SRCDIR ?= $(dir $(THISMKFILE))
  
 -CC = gcc
 -SHELL := bash
 -RPM_OPT_FLAGS ?= -Os -Wall -g -D_FORTIFY_SOURCE=2
 -CFLAGS = $(RPM_OPT_FLAGS) $(EXTRA_CFLAGS) -DHAVE_CONFIG_H -I .
 -CFLAGS_OPT = $(CFLAGS) -O3
 +CFLAGS_OPT = $(CFLAGS) -DHAVE_CONFIG_H
  INSTALL ?= install
  INSTALLFLAGS = -s
  prefix = $(DESTDIR)/usr
 @@ -39,7 +35,7 @@ ID = $(shell git describe --tags || cat REL-ID)
  LIBDIR = /usr/$(LIB)
  COMPILER = $(shell $(CC) --version | head -n1)
  ID = $(shell git describe --tags || cat REL-ID)
--DEFINES = -DVERSION=\"$(VERSION)\"  -D__COMPILER__="\"$(COMPILER)\"" -DID=\"$(ID)\" # -DPLUGSEARCH="\"$(LIBDIR)\""
-+DEFINES = -DVERSION=\"$(VERSION)\"  -D__COMPILER__="\"$(COMPILER)\"" -DID=\"$(ID)\" -DHAVE_CONFIG_H # -DPLUGSEARCH="\"$(LIBDIR)\""
+-DEFINES = -DIO_HAVOC=1 -DVERSION=\"$(VERSION)\"  -D__COMPILER__="\"$(COMPILER)\"" -DID=\"$(ID)\" # -DPLUGSEARCH="\"$(LIBDIR)\""
++DEFINES = -DIO_HAVOC=1 -DVERSION=\"$(VERSION)\"  -D__COMPILER__="\"$(COMPILER)\"" -DID=\"$(ID)\" -DHAVE_CONFIG_H # -DPLUGSEARCH="\"$(LIBDIR)\""
  OUT = -o dd_rescue
  PIC = -fPIC
  PIE = -fPIE
-@@ -75,19 +71,13 @@ endif
-   HAVE_XATTR=0
+@@ -89,19 +85,13 @@ endif
+ endif
  endif
  
 -ifeq ($(CC),wcl386)
 -  CFLAGS = "-ox -wx $(EXTRA_CFLAGS)"
 -  DEFINES = -dMISS_STRSIGNAL -dMISS_PREAD -dVERSION=\"$(VERSION)\" -d__COMPILER__="\"$(COMPILER)\""
 -  OUT = ""
 -endif
 -
  MACH := $(shell uname -m | tr A-Z a-z | sed 's/i[3456]86/i386/')
  
  ISX86 := 0
  ifeq ($(MACH),i386)
    ISX86 := 1
  endif
 -ifeq ($(MACH),x86_64)
 +ifeq ($(MACH),amd64)
    ISX86 := 1
    LIB = lib64
  endif
-@@ -296,7 +286,7 @@ libddr_lzo.so: libddr_lzo.po
+@@ -348,7 +338,7 @@ libddr_lzo.so: libddr_lzo.po
  	ln -sf $< $@
  
  libddr_lzo.so: libddr_lzo.po
 -	$(CC) -shared -o $@ $^ -llzo2
 +	$(CC) -shared -o $@ $^ $(EXTRA_LDFLAGS) -llzo2
  
  libddr_null.so: libddr_null.po
  	$(CC) -shared -o $@ $^
-@@ -367,7 +357,7 @@ dd_rescue: $(SRCDIR)/dd_rescue.c $(DDR_HEADERS) $(OBJE
+@@ -442,7 +432,7 @@ dd_rescue: $(SRCDIR)/dd_rescue.c $(DDR_HEADERS) $(OBJE
  
  # This is the default built
  dd_rescue: $(SRCDIR)/dd_rescue.c $(DDR_HEADERS) $(OBJECTS) $(OBJECTS2)
 -	$(CC) $(CFLAGS) $(PIE) $(LDPIE) $(DEFINES) $< $(OUT) $(OBJECTS) $(OBJECTS2) -ldl $(EXTRA_LDFLAGS) $(RDYNAMIC)
 +	$(CC) $(CFLAGS) $(PIE) $(LDPIE) $(DEFINES) $< $(OUT) $(OBJECTS) $(OBJECTS2) $(EXTRA_LDFLAGS) $(RDYNAMIC)
  
  # Test programs 
  md5: $(SRCDIR)/md5.c $(SRCDIR)/md5.h $(SRCDIR)/hash.h config.h
diff --git a/sysutils/dd_rescue/files/patch-dd__rescue.c b/sysutils/dd_rescue/files/patch-dd__rescue.c
index 1393dac40474..b6681197e329 100644
--- a/sysutils/dd_rescue/files/patch-dd__rescue.c
+++ b/sysutils/dd_rescue/files/patch-dd__rescue.c
@@ -1,71 +1,71 @@
---- dd_rescue.c.orig	2024-08-22 17:41:01 UTC
+--- dd_rescue.c.orig	2025-12-07 12:29:02 UTC
 +++ dd_rescue.c
 @@ -144,12 +144,11 @@
  # include <fallocate.h>
  #else
  # ifdef HAVE_FALLOCATE64
 -#  include <linux/falloc.h>
  typedef off64_t __off64_t;
  # endif
  #endif
  
 -#if defined(HAVE_DLFCN_H) && !defined(NO_LIBDL)
 +#if defined(HAVE_DLFCN_H) && !defined(NO_LIBDL) && !defined(__FreeBSD__)
  #include <dlfcn.h>
  void* libfalloc = (void*)0;
  #define USE_LIBDL 1
 @@ -177,7 +176,7 @@ void* libfalloc = (void*)0;
  #endif
  
  /* Handle lack of stat64 */
 -#ifdef HAVE_STAT64
 +#if defined(HAVE_STAT64) && !defined(__FreeBSD__)
  # define STAT64 stat64
  # define FSTAT64 fstat64
  #else
 @@ -186,17 +185,17 @@ void* libfalloc = (void*)0;
  # warning We lack stat64, may not handle >2GB files correctly
  #endif
  
 -#ifndef HAVE_LSEEK64
 +#if !defined(HAVE_LSEEK64) || defined(__FreeBSD__)
  # define lseek64 lseek
  # warning We lack lseek64, may not handle >2GB files correctly
  #endif
  
  /* This is not critical -- most platforms have an internal 64bit offset with plain open() */
 -#ifndef HAVE_OPEN64
 +#if !defined(HAVE_OPEN64 ) || defined(__FreeBSD__)
  # define open64 open
  #endif
  
 -#if !defined(HAVE_PREAD64) || defined(TEST_SYSCALL)
 +#if !defined(HAVE_PREAD64) || defined(TEST_SYSCALL) || defined(__FreeBSD__)
  #include "pread64.h"
  #endif
  
-@@ -698,7 +697,7 @@ static void unload_plugins() {};
+@@ -748,7 +747,7 @@ static void unload_plugins() {};
  static void unload_plugins() {};
  #endif
  
 -#if defined(HAVE_POSIX_FADVISE) && !defined(HAVE_POSIX_FADVISE64)
 +#if defined(HAVE_POSIX_FADVISE) && !defined(HAVE_POSIX_FADVISE64) || defined(__FreeBSD__)
  #define posix_fadvise64 posix_fadvise
  #endif
  #ifdef HAVE_POSIX_FADVISE
-@@ -1055,13 +1054,13 @@ static void do_fallocate(int fd, const char* onm, opt_
+@@ -1101,13 +1100,13 @@ static void do_fallocate(int fd, const char* onm, opt_
  				op->init_opos, to_falloc);
  #ifdef HAVE_FALLOCATE64
  	else
 -		rc = fallocate64(fd, 1, op->init_opos, to_falloc);
 +		rc = posix_fallocate(fd, op->init_opos, to_falloc);
  #endif
  #elif defined(HAVE_LIBFALLOCATE)
  	rc = linux_fallocate64(fd, FALLOC_FL_KEEP_SIZE, 
  			      op->init_opos, to_falloc);
  #else /* HAVE_FALLOCATE64 */
 -	rc = fallocate64(fd, 1, op->init_opos, to_falloc);
 +	rc = posix_fallocate(fd, op->init_opos, to_falloc);
  #endif
  	if (rc)
  	       fplog(stderr, WARN, "fallocate %s (%sk, %sk) failed: %s\n",
diff --git a/sysutils/dd_rescue/files/patch-libddr__null.c b/sysutils/dd_rescue/files/patch-libddr__null.c
index e2d5ca5a928c..2c33a148f275 100644
--- a/sysutils/dd_rescue/files/patch-libddr__null.c
+++ b/sysutils/dd_rescue/files/patch-libddr__null.c
@@ -1,13 +1,14 @@
---- libddr_null.c.orig	2015-04-15 08:56:38 UTC
+--- libddr_null.c.orig	2025-01-19 17:00:21 UTC
 +++ libddr_null.c
-@@ -8,8 +8,10 @@
+@@ -8,9 +8,11 @@
  
  #include "ddr_plugin.h"
  #include "ddr_ctrl.h"
 +#include "ffs.h"
  #include <string.h>
  #include <stdlib.h>
+ #include <assert.h>
 +#include <stdint.h>
  
  /* fwd decl */
  extern ddr_plugin_t ddr_plug;
diff --git a/sysutils/dd_rescue/files/patch-pread64.h b/sysutils/dd_rescue/files/patch-pread64.h
index e26c7f132e7a..362fc50513f0 100644
--- a/sysutils/dd_rescue/files/patch-pread64.h
+++ b/sysutils/dd_rescue/files/patch-pread64.h
@@ -1,11 +1,16 @@
---- pread64.h.orig	2024-08-25 11:50:36 UTC
+--- pread64.h.orig	2024-09-16 18:11:52 UTC
 +++ pread64.h
-@@ -18,7 +18,7 @@
+@@ -18,11 +18,11 @@
  # include <sys/reg.h>
  #endif
  
 -#if !defined(HAVE_PREAD64) && __WORDSIZE == 64 && !defined(TEST_SYSCALL) && defined(HAVE_PREAD)
 +#if defined(__FreeBSD__) || !defined(HAVE_PREAD64) && __WORDSIZE == 64 && !defined(TEST_SYSCALL) && defined(HAVE_PREAD)
- #define pread64 pread
- #define pwrite64 pwrite
- #define HAVE_PREAD64
+ # define pread64 pread
+ # define HAVE_PREAD64 1
+ #endif
+-#if !defined(HAVE_PWRITE64) && __WORDSIZE == 64 && !defined(TEST_SYSCALL) && defined(HAVE_PWRITE)
++#if defined(__FreeBSD__) || !defined(HAVE_PWRITE64) && __WORDSIZE == 64 && !defined(TEST_SYSCALL) && defined(HAVE_PWRITE)
+ # define pwrite64 pwrite
+ # define HAVE_PWRITE64 1
+ #endif