diff --git a/science/orthanc/Makefile b/science/orthanc/Makefile
index 9e7f31c21893..4e9d324c6885 100644
--- a/science/orthanc/Makefile
+++ b/science/orthanc/Makefile
@@ -1,57 +1,59 @@
 # Created by: maintainer.freebsd@xpoundit.com
 
 PORTNAME=	orthanc
-DISTVERSION=	1.9.3
+DISTVERSION=	1.9.7
 CATEGORIES=	science
 MASTER_SITES=	https://www.orthanc-server.com/downloads/get.php?path=/orthanc/
 DISTNAME=	Orthanc-${PORTVERSION}
 
 MAINTAINER=	maintainer.freebsd@xpoundit.com
 COMMENT=	Lightweight DICOM server for healthcare and medical research
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_atomic.so:devel/boost-libs \
 		libcivetweb.so:www/civetweb \
 		libcurl.so:ftp/curl \
 		libdcmtkcharls.so:graphics/dcmtk \
 		libgtest.so:devel/googletest \
 		libicuuc.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libpng16.so:graphics/png \
 		libpugixml.so:textproc/pugixml \
 		libtiff.so:graphics/tiff \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		cmake gnome iconv jpeg lua python:build sqlite ssl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/Orthanc-${PORTVERSION}
 
-CMAKE_SOURCE_PATH=	${WRKSRC}/OrthancServer
 CMAKE_OFF=	BUILD_CONNECTIVITY_CHECKS UNIT_TESTS_WITH_HTTP_CONNEXIONS
 CMAKE_ON=	USE_SYSTEM_BOOST USE_SYSTEM_CIVETWEB USE_SYSTEM_DCMTK \
 		USE_SYSTEM_GOOGLE_TEST USE_SYSTEM_JSONCPP USE_SYSTEM_LIBICONV \
 		USE_SYSTEM_LIBJPEG USE_SYSTEM_LIBPNG USE_SYSTEM_LUA \
 		USE_SYSTEM_OPENSSL USE_SYSTEM_PUGIXML USE_SYSTEM_SQLITE \
 		USE_SYSTEM_UUID USE_SYSTEM_ZLIB
+CMAKE_OFF=	BUILD_CONNECTIVITY_CHECKS UNIT_TESTS_WITH_HTTP_CONNEXIONS
+CMAKE_SOURCE_PATH=	${WRKSRC}/OrthancServer
+
 CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
 USE_RC_SUBR=	orthanc
 
 USERS=		orthanc
 GROUPS=		orthanc
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+PLIST_SUB+=	DISTVERSION=${DISTVERSION}
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/db/orthanc/db/db-v5
 	${MKDIR} ${STAGEDIR}${DATADIR}/plugins
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${CMAKE_SOURCE_PATH}/Resources/Configuration.json
 	${CP} ${CMAKE_SOURCE_PATH}/Resources/Configuration.json ${STAGEDIR}${ETCDIR}/orthanc.json.sample
 
 .include <bsd.port.mk>
diff --git a/science/orthanc/distinfo b/science/orthanc/distinfo
index ed25e78020f7..9f7ae409e3b5 100644
--- a/science/orthanc/distinfo
+++ b/science/orthanc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620899601
-SHA256 (Orthanc-1.9.3.tar.gz) = 41cc35a3d15ecb0d7b834e8e28a740cc4ffa1f333c019a764228d60e96608960
-SIZE (Orthanc-1.9.3.tar.gz) = 1818313
+TIMESTAMP = 1634131378
+SHA256 (Orthanc-1.9.7.tar.gz) = dd662add29808a15e4f1b24582021d5ea84146eefb2b6437da018c7db2168e51
+SIZE (Orthanc-1.9.7.tar.gz) = 1856489
diff --git a/science/orthanc/files/patch-OrthancFramework_Resources_CMake_CivetwebConfiguration.cmake b/science/orthanc/files/patch-OrthancFramework_Resources_CMake_CivetwebConfiguration.cmake
index b1cd8bd06165..0237ef13ed79 100644
--- a/science/orthanc/files/patch-OrthancFramework_Resources_CMake_CivetwebConfiguration.cmake
+++ b/science/orthanc/files/patch-OrthancFramework_Resources_CMake_CivetwebConfiguration.cmake
@@ -1,64 +1,64 @@
---- OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake.orig	2021-05-12 13:54:35 UTC
+--- OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake.orig	2021-08-30 20:14:33 UTC
 +++ OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake
-@@ -98,32 +98,38 @@ else()
+@@ -109,32 +109,38 @@ else()
  
    cmake_reset_check_state()
    set(CMAKE_REQUIRED_LIBRARIES dl pthread)
 -  CHECK_LIBRARY_EXISTS(civetweb mg_start "" HAVE_CIVETWEB_LIB)
 -  if (NOT HAVE_CIVETWEB_LIB)
 -    message(FATAL_ERROR "Please install the libcivetweb-dev package")
 -  endif()
  
 -  link_libraries(civetweb)
 +  find_library(CIVETWEB_LIB NAMES civetweb PATHS
 +    /usr/lib
 +    /usr/local/lib
 +  )
  
 -  # Check whether the system distribution of civetweb contains the
 -  # patch "../Patches/civetweb-1.13.patch" that allows to disable
 -  # keep-alive on selected HTTP connections. This is useful to speed
 -  # up multipart transfers, as encountered in DICOMweb.
 -  CHECK_LIBRARY_EXISTS(civetweb mg_disable_keep_alive "" CIVETWEB_HAS_DISABLE_KEEP_ALIVE_1)  # From "../Patches/civetweb-1.13.patch"
 -  CHECK_LIBRARY_EXISTS(civetweb mg_disable_connection_keep_alive "" CIVETWEB_HAS_DISABLE_KEEP_ALIVE_2)  # From civetweb >= 1.14
 -  if (CIVETWEB_HAS_DISABLE_KEEP_ALIVE_1 OR
 -      CIVETWEB_HAS_DISABLE_KEEP_ALIVE_2)
 -    add_definitions(
 -      -DCIVETWEB_HAS_DISABLE_KEEP_ALIVE=1
 -      -DCIVETWEB_HAS_WEBDAV_WRITING=1
 -      )
 -    message("Performance: Your system-wide distribution of civetweb is configured for best performance")
 +  if (CIVETWEB_LIB)
 +    CHECK_LIBRARY_EXISTS(${CIVETWEB_LIB} mg_start "" HAVE_CIVETWEB_LIB)
 +    if (NOT HAVE_CIVETWEB_LIB)
 +      message(FATAL_ERROR "Unable to use mg_start from civetweb library")
 +    endif()
 +
-+    CHECK_LIBRARY_EXISTS(${CIVETWEB_LIB} mg_disable_keep_alive "" CIVETWEB_HAS_DISABLE_KEEP_ALIVE)
++    CHECK_LIBRARY_EXISTS(${CIVETWEB_LIB} mg_disable_connection_keep_alive "" CIVETWEB_HAS_DISABLE_KEEP_ALIVE)
 +    if (CIVETWEB_HAS_DISABLE_KEEP_ALIVE)
 +      add_definitions(
 +        -DCIVETWEB_HAS_DISABLE_KEEP_ALIVE=1
 +        -DCIVETWEB_HAS_WEBDAV_WRITING=1
 +        )
 +      message("Performance: Your system-wide distribution of civetweb is configured for best performance")
 +    else()
-+      message(WARNING "Performance: Your system-wide distribution of civetweb does not feature the mg_disable_keep_alive() function, and WebDAV will only be available for read-only access")
++      message(WARNING "Performance: Your system-wide distribution of civetweb does not feature the mg_disable_connection_keep_alive() function, and WebDAV will only be available for read-only access")
 +      add_definitions(
 +        -DCIVETWEB_HAS_DISABLE_KEEP_ALIVE=0
 +        -DCIVETWEB_HAS_WEBDAV_WRITING=0
 +        )
 +    endif()
 +
 +    get_filename_component(CIVETWEB_LIB_PATH ${CIVETWEB_LIB} DIRECTORY)
 +    link_directories(${CIVETWEB_LIB_PATH})
 +    link_libraries(civetweb)
    else()
 -    message(WARNING "Performance: Your system-wide distribution of civetweb does not feature the mg_disable_keep_alive() function, and WebDAV will only be available for read-only access")
 -    add_definitions(
 -      -DCIVETWEB_HAS_DISABLE_KEEP_ALIVE=0
 -      -DCIVETWEB_HAS_WEBDAV_WRITING=0
 -      )
 +    message(FATAL_ERROR "Unable to find the civetweb library")
    endif()
  
    unset(CMAKE_REQUIRED_LIBRARIES)  # This reset must be after "CHECK_LIBRARY_EXISTS"
diff --git a/science/orthanc/pkg-plist b/science/orthanc/pkg-plist
index 3c86361bc527..c31909c48a74 100644
--- a/science/orthanc/pkg-plist
+++ b/science/orthanc/pkg-plist
@@ -1,18 +1,18 @@
 @owner orthanc
 @group orthanc
 @mode 700
 @dir %%DATADIR%%/plugins
 @dir /var/db/orthanc/db/db-v5
 @dir /var/db/orthanc/db
 @dir /var/db/orthanc
 @mode 600
 @sample %%ETCDIR%%/orthanc.json.sample
 @mode
 bin/OrthancRecoverCompressedFile
 include/orthanc/OrthancCDatabasePlugin.h
 include/orthanc/OrthancCPlugin.h
 sbin/Orthanc
 %%DATADIR%%/plugins/libModalityWorklists.so
-%%DATADIR%%/plugins/libModalityWorklists.so.%%PORTVERSION%%
+%%DATADIR%%/plugins/libModalityWorklists.so.%%DISTVERSION%%
 %%DATADIR%%/plugins/libServeFolders.so
-%%DATADIR%%/plugins/libServeFolders.so.%%PORTVERSION%%
+%%DATADIR%%/plugins/libServeFolders.so.%%DISTVERSION%%