diff --git a/graphics/epsonscan2/Makefile b/graphics/epsonscan2/Makefile
index 5a47aa4e5b72..dd9a4c8ff2ee 100644
--- a/graphics/epsonscan2/Makefile
+++ b/graphics/epsonscan2/Makefile
@@ -1,49 +1,47 @@
 PORTNAME=	epsonscan2
 DISTVERSION=	6.7.70.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	https://download3.ebz.epson.net/dsc/f/03/00/16/14/37/7577ee65efdad48ee2d2f38d9eda75418e490552/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1.src
+DISTNAME=	${PORTNAME}-${DISTVERSION}-1.src
 
 MAINTAINER=	fbsd@opal.com
 COMMENT=	Epson Scan 2 scanner driver
 WWW=		https://download.ebz.epson.net/man/linux/epsonscan2_e.html
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	sane-config:graphics/sane-backends
-LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
-		libpng.so:graphics/png \
+BUILD_DEPENDS=	sane-config:graphics/sane-backends \
+		boost-libs>=1.36.0:devel/boost-libs
+LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USES=		cmake jpeg localbase qt:5 xorg
 USE_LDCONFIG=	${PREFIX}/lib/epsonscan2
 USE_QT=		buildtools:build core gui qmake:build widgets
 USE_XORG=	x11 xau xcb xdmcp
 
 EPSON_VERSION=	1.0.0.0
 
 CONFIGURE_ENV+=	STAGEDIR=${STAGEDIR}
 
-CFLAGS+=	-I${PREFIX}/include
-
 SUB_FILES=	pkg-message \
 		Read_me.FreeBSD
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-1
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-1
 
 OPTIONS_DEFINE=		AVAHI
 OPTIONS_DEFAULT=	AVAHI
 AVAHI_DESC=		Use avahi to find scanners
 AVAHI_RUN_DEPENDS=	avahi-browse:net/avahi-app
 
 pre-configure:
 		${RM} ${WRKSRC}/CMakeCache.txt
 
 post-install:
 		${RM} -rf ${STAGEDIR}${DOCSDIR}
 		${MV} ${STAGEDIR}${DOCSDIR}-${EPSON_VERSION}-1 ${STAGEDIR}${DOCSDIR}
 		${INSTALL_DATA} ${WRKDIR}/Read_me.FreeBSD ${STAGEDIR}${PREFIX}/lib/epsonscan2
 
 .include <bsd.port.mk>
diff --git a/graphics/epsonscan2/files/patch-src_ScanSDK_Src_SDK_ScanMgr.cpp b/graphics/epsonscan2/files/patch-src_ScanSDK_Src_SDK_ScanMgr.cpp
new file mode 100644
index 000000000000..620679c03d64
--- /dev/null
+++ b/graphics/epsonscan2/files/patch-src_ScanSDK_Src_SDK_ScanMgr.cpp
@@ -0,0 +1,20 @@
+--- src/ScanSDK/Src/SDK/ScanMgr.cpp.orig	2024-09-12 07:10:37 UTC
++++ src/ScanSDK/Src/SDK/ScanMgr.cpp
+@@ -298,7 +298,7 @@ BOOL CScanMgr::setSettingParameter(const eSpecifiedPar
+  switch (SpecifiedParameter)
+  {
+  case SP_SLEEP_TIMER:
+-  if (m_sv->device_data.SleepTime.capability.minValue <= setparam <= m_sv->device_data.SleepTime.capability.maxValue){
++  if (m_sv->device_data.SleepTime.capability.minValue <= setparam && setparam <= m_sv->device_data.SleepTime.capability.maxValue){
+    m_sv->device_data.SleepTime.select = setparam;
+    parameter_exist = TRUE;
+    SDI_TRACE_LOG("[INFO]setSettingParameter SleepTime set: %d", m_sv->device_data.SleepTime.select);
+@@ -316,7 +316,7 @@ BOOL CScanMgr::setSettingParameter(const eSpecifiedPar
+     }
+    }
+   }else{
+-   if (m_sv->device_data.AutoPowerOffTime.capability.minValue <= setparam <= m_sv->device_data.AutoPowerOffTime.capability.maxValue){
++   if (m_sv->device_data.AutoPowerOffTime.capability.minValue <= setparam && setparam <= m_sv->device_data.AutoPowerOffTime.capability.maxValue){
+     m_sv->device_data.AutoPowerOffTime.select = setparam;
+     parameter_exist = TRUE;
+     SDI_TRACE_LOG("[INFO]setSettingParameter AutoPowerOffTime set: %d", m_sv->device_data.AutoPowerOffTime.select);