diff --git a/math/clad/Makefile b/math/clad/Makefile
index 4187543719d6..1603487effe5 100644
--- a/math/clad/Makefile
+++ b/math/clad/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	clad
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.5
+DISTVERSION=	1.6
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Automatic differentiation for C/C++
 WWW=		https://github.com/vgvassilev/clad
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 TEST_DEPENDS=	kokkos>0:devel/kokkos
 
 USES=		cmake:testing llvm:16,build,run localbase
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vgvassilev
 
 CMAKE_ARGS=	-DClang_DIR=${LLVM_PREFIX}/lib/cmake/clang \
 		-DLLVM_DIR=${LLVM_PREFIX}/lib/cmake/llvm \
 		-DLLVM_EXTERNAL_LIT=${LLVM_PREFIX}/bin/llvm-lit
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_TESTING_ON=	FREEBSD_BUILD_TESTS FREEBSD_BUILD_DEMOS
 CMAKE_TESTING_TARGET=	check-clad
 
 #CXXFLAGS+=	-D_OPENMP
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e ' \
 			s|import lit|&${LLVM_VERSION}|; \
 			s|lit\.|lit${LLVM_VERSION}.| \
 		' \
 		${WRKSRC}/test/lit.cfg
 
-# tests fail to compile: https://github.com/vgvassilev/clad/issues/798
+# tests fail to compile: https://github.com/vgvassilev/clad/issues/993
 
 .include <bsd.port.mk>
diff --git a/math/clad/distinfo b/math/clad/distinfo
index 73891ddb2e0f..5da1dfdef415 100644
--- a/math/clad/distinfo
+++ b/math/clad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1716351065
-SHA256 (vgvassilev-clad-v1.5_GH0.tar.gz) = fa044d8a161cbe3ed4e97df0e7ab2b1064a7f3fce7593f0a5d583f4bd866bf90
-SIZE (vgvassilev-clad-v1.5_GH0.tar.gz) = 1030298
+TIMESTAMP = 1721434166
+SHA256 (vgvassilev-clad-v1.6_GH0.tar.gz) = 18b4a3694f40d7a1cd510237f83d0be1e3c83c435dd9e1395ac4068e21a77b01
+SIZE (vgvassilev-clad-v1.6_GH0.tar.gz) = 1159962
diff --git a/math/clad/files/patch-CMakeLists.txt b/math/clad/files/patch-CMakeLists.txt
index a253419c073d..8fd367a13fc2 100644
--- a/math/clad/files/patch-CMakeLists.txt
+++ b/math/clad/files/patch-CMakeLists.txt
@@ -1,24 +1,22 @@
---- CMakeLists.txt.orig	2024-05-21 05:35:52 UTC
+--- CMakeLists.txt.orig	2024-07-17 20:27:26 UTC
 +++ CMakeLists.txt
-@@ -317,8 +317,10 @@ if (NOT CLAD_BUILD_STATIC_ONLY)
+@@ -321,8 +321,10 @@ if (NOT CLAD_BUILD_STATIC_ONLY)
      include(GoogleBenchmark)
    endif(CLAD_ENABLE_BENCHMARKS)
  
 +  if (FREEBSD_BUILD_DEMOS)
    add_subdirectory(demos/ErrorEstimation/CustomModel)
    add_subdirectory(demos/ErrorEstimation/PrintModel)
 +  endif()
  
-   # Change the default compiler to the clang which we run clad upon. Our unittests
-   # need to use a supported by clad compiler. Note that's a huge hack and it is
-@@ -331,8 +333,10 @@ if (NOT CLAD_BUILD_STATIC_ONLY)
-   string(REPLACE "-fno-lifetime-dse" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-   string(REPLACE "-Wno-class-memaccess" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+   if (NOT CLAD_DISABLE_TESTS OR CLAD_ENABLE_BENCHMARKS)
+     # Change the default compiler to the clang which we run clad upon. Our unittests
+@@ -337,7 +339,7 @@ if (NOT CLAD_BUILD_STATIC_ONLY)
+     string(REPLACE "-Wno-class-memaccess" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+   endif()
  
+-  if (NOT CLAD_DISABLE_TESTS)
 +  if (FREEBSD_BUILD_TESTS)
-   add_subdirectory(unittests)
-   add_subdirectory(test)
-+  endif()
- 
-   # Add benchmarking infrastructure.
-   if (CLAD_ENABLE_BENCHMARKS)
+     add_subdirectory(unittests)
+     add_subdirectory(test)
+   endif()
diff --git a/math/clad/pkg-plist b/math/clad/pkg-plist
index af7a92cc2b72..2f8d7d43323a 100644
--- a/math/clad/pkg-plist
+++ b/math/clad/pkg-plist
@@ -1,40 +1,40 @@
 include/clad/Differentiator/Array.h
 include/clad/Differentiator/ArrayExpression.h
 include/clad/Differentiator/ArrayRef.h
 include/clad/Differentiator/BaseForwardModeVisitor.h
 include/clad/Differentiator/BuiltinDerivatives.h
 include/clad/Differentiator/CladConfig.h
 include/clad/Differentiator/CladUtils.h
 include/clad/Differentiator/Compatibility.h
 include/clad/Differentiator/DerivativeBuilder.h
 include/clad/Differentiator/DerivedFnCollector.h
 include/clad/Differentiator/DerivedFnInfo.h
 include/clad/Differentiator/DiffMode.h
 include/clad/Differentiator/DiffPlanner.h
 include/clad/Differentiator/Differentiator.h
 include/clad/Differentiator/DynamicGraph.h
 include/clad/Differentiator/ErrorEstimator.h
 include/clad/Differentiator/EstimationModel.h
 include/clad/Differentiator/ExternalRMVSource.h
 include/clad/Differentiator/FunctionTraits.h
 include/clad/Differentiator/HessianModeVisitor.h
-include/clad/Differentiator/JacobianModeVisitor.h
 include/clad/Differentiator/Matrix.h
 include/clad/Differentiator/MultiplexExternalRMVSource.h
 include/clad/Differentiator/NumericalDiff.h
 include/clad/Differentiator/ParseDiffArgsTypes.h
 include/clad/Differentiator/PushForwardModeVisitor.h
 include/clad/Differentiator/ReverseModeForwPassVisitor.h
 include/clad/Differentiator/ReverseModeVisitor.h
 include/clad/Differentiator/ReverseModeVisitorDirectionKinds.h
 include/clad/Differentiator/STLBuiltins.h
 include/clad/Differentiator/Sins.h
 include/clad/Differentiator/StmtClone.h
 include/clad/Differentiator/Tape.h
 include/clad/Differentiator/VectorForwardModeVisitor.h
 include/clad/Differentiator/VectorPushForwardModeVisitor.h
 include/clad/Differentiator/Version.h
 include/clad/Differentiator/VisitorBase.h
 include/clad/tools/ClangBackendPlugin.h
 include/clad/tools/ClangPlugin.h
 lib/clad.so
+lib/cmake/clad/AddClad.cmake