diff --git a/science/orthanc-dicomweb/Makefile b/science/orthanc-dicomweb/Makefile
index a3da463d7be8..ba4dd496d175 100644
--- a/science/orthanc-dicomweb/Makefile
+++ b/science/orthanc-dicomweb/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	orthanc-dicomweb
 DISTVERSION=	1.8
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	science
 MASTER_SITES=	https://www.orthanc-server.com/downloads/get.php?path=/plugin-dicom-web/:main \
 		https://www.orthanc-server.com/downloads/get.php?path=/orthanc/:framework \
 		https://orthanc.osimis.io/ThirdPartyDownloads/:thirdparty \
 		https://orthanc.osimis.io/ThirdPartyDownloads/dicom-web/:thirdpartydicomweb
 DISTFILES=	OrthancDicomWeb-${PORTVERSION}.tar.gz:main
 EXTRADISTFILES=	Orthanc-1.11.0.tar.gz:framework \
 		e2fsprogs-1.44.5.tar.gz:thirdparty \
 		bootstrap-4.3.1.zip:thirdpartydicomweb \
 		vuejs-2.6.10.tar.gz:thirdpartydicomweb \
 		axios-0.19.0.tar.gz:thirdpartydicomweb \
 		Font-Awesome-4.7.0.tar.gz:thirdpartydicomweb \
 		bootstrap-vue-2.0.0-rc.24-dist.tar.gz:thirdpartydicomweb \
 		babel-polyfill-6.26.0.min.js.gz:thirdpartydicomweb
 DISTFILES+=	${EXTRADISTFILES}
 DIST_SUBDIR=	orthanc
 EXTRACT_ONLY=	OrthancDicomWeb-${PORTVERSION}.tar.gz
 
 MAINTAINER=	maintainer.freebsd@xpoundit.com
 COMMENT=	Orthanc plugin to bring support of the DICOMweb standard into Orthanc
 WWW=		https://www.orthanc-server.com/static.php?page=dicomweb
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/orthanc/OrthancCPlugin.h:science/orthanc
 LIB_DEPENDS=	libboost_atomic.so:devel/boost-libs \
 		libexpat.so:textproc/expat2 \
 		libgdcmCommon.so:devel/gdcm \
 		libicudata.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libopenjp2.so:graphics/openjpeg \
 		libpugixml.so:textproc/pugixml
 RUN_DEPENDS=	Orthanc:science/orthanc
 
 USES=		cmake localbase python:build
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/ThirdPartyDownloads/Orthanc-1.11.0/OrthancFramework/Sources \
 		-DORTHANC_FRAMEWORK_SOURCE=path
 CMAKE_OFF=	USE_SYSTEM_UUID
 
 CFLAGS+=	-DORTHANC_ENABLE_LOGGING_PLUGIN -DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
 WRKSRC=		${WRKDIR}/OrthancDicomWeb-${PORTVERSION}
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 post-extract:
 	${MKDIR} ${WRKSRC}/ThirdPartyDownloads
 .for f in ${EXTRADISTFILES:C/:[^:]*//}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSRC}/ThirdPartyDownloads
 .endfor
 	${TAR} -C ${WRKSRC}/ThirdPartyDownloads -xf ${WRKSRC}/ThirdPartyDownloads/Orthanc-1.11.0.tar.gz
 
 do-test:
 	@cd ${BUILD_WRKSRC} && ./UnitTests
 
 .include <bsd.port.mk>
diff --git a/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_SystemToolbox.cpp b/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_SystemToolbox.cpp
new file mode 100644
index 000000000000..be3a52257299
--- /dev/null
+++ b/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_SystemToolbox.cpp
@@ -0,0 +1,11 @@
+--- ThirdPartyDownloads/Orthanc-1.11.0/OrthancFramework/Sources/SystemToolbox.cpp.orig	2022-05-09 09:19:44 UTC
++++ ThirdPartyDownloads/Orthanc-1.11.0/OrthancFramework/Sources/SystemToolbox.cpp
+@@ -728,7 +728,7 @@ namespace Orthanc
+ 
+   MimeType SystemToolbox::AutodetectMimeType(const std::string& path)
+   {
+-    std::string extension = boost::filesystem::extension(path);
++    std::string extension = boost::filesystem::path(path).extension().string();
+     Toolbox::ToLowerCase(extension);
+ 
+     // http://en.wikipedia.org/wiki/Mime_types
diff --git a/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Engine_PluginsManager.cpp b/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Engine_PluginsManager.cpp
new file mode 100644
index 000000000000..7e84c746faa1
--- /dev/null
+++ b/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Engine_PluginsManager.cpp
@@ -0,0 +1,11 @@
+--- ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Plugins/Engine/PluginsManager.cpp.orig	2022-05-09 09:19:44 UTC
++++ ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Plugins/Engine/PluginsManager.cpp
+@@ -292,7 +292,7 @@ namespace Orthanc
+       }
+       else
+       {
+-        std::string extension = boost::filesystem::extension(it->path());
++        std::string extension = it->path().extension().string();
+         Toolbox::ToLowerCase(extension);
+ 
+         if (extension == PLUGIN_EXTENSION)
diff --git a/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp b/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp
new file mode 100644
index 000000000000..dad50da54856
--- /dev/null
+++ b/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp
@@ -0,0 +1,11 @@
+--- ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp.orig	2022-05-09 09:19:44 UTC
++++ ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp
+@@ -163,7 +163,7 @@ OrthancPluginErrorCode Callback(OrthancPluginWorklistA
+         if (type == fs::regular_file ||
+             type == fs::reparse_file)   // cf. BitBucket issue #11
+         {
+-          std::string extension = fs::extension(it->path());
++          std::string extension = it->path().extension().string();
+           std::transform(extension.begin(), extension.end(), extension.begin(), tolower);  // Convert to lowercase
+ 
+           if (extension == ".wl")
diff --git a/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Sources_OrthancConfiguration.cpp b/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Sources_OrthancConfiguration.cpp
new file mode 100644
index 000000000000..9df1a25a54a7
--- /dev/null
+++ b/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Sources_OrthancConfiguration.cpp
@@ -0,0 +1,11 @@
+--- ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Sources/OrthancConfiguration.cpp.orig	2022-05-09 09:19:44 UTC
++++ ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Sources/OrthancConfiguration.cpp
+@@ -113,7 +113,7 @@ namespace Orthanc
+     {
+       if (!is_directory(it->status()))
+       {
+-        std::string extension = boost::filesystem::extension(it->path());
++        std::string extension = it->path().extension().string();
+         Toolbox::ToLowerCase(extension);
+ 
+         if (extension == ".json")