diff --git a/graphics/glslang/Makefile b/graphics/glslang/Makefile
index 7b70cbb63e45..b9334bd20533 100644
--- a/graphics/glslang/Makefile
+++ b/graphics/glslang/Makefile
@@ -1,29 +1,48 @@
 PORTNAME=	glslang
-DISTVERSION=	16.1.0
-PORTREVISION=	2
+DISTVERSION=	16.2.0
 CATEGORIES=	graphics
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	OpenGL and OpenGL ES shader front end and validator
 WWW=		https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ \
 		https://github.com/KhronosGroup/glslang
 
 LICENSE=	APACHE20 BSD2CLAUSE BSD3CLAUSE GPLv3+ MIT
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	spirv-tools>=2024.4.r2:graphics/spirv-tools
 RUN_DEPENDS=	spirv-tools>0:graphics/spirv-tools
 TEST_DEPENDS=	bash:shells/bash \
 		gmake:devel/gmake
 
+FLAVORS=	static shared
+FLAVOR?=	${FLAVORS:[1]}
+shared_PKGNAMESUFFIX=	-shared
+
 USES=		cmake:testing compiler:c++11-lib python:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 
 CMAKE_ON=	ALLOW_EXTERNAL_SPIRV_TOOLS
 
 PORTSCOUT=	limit:^[0-9]+\.	# avoid tags like sdk-candidate-26-jul-2020
 
+.if ${FLAVOR} == static
+PLIST_SUB=	SHARED="@comment " \
+		STATIC=""
+.else
+CMAKE_ON+=	BUILD_SHARED_LIBS
+PLIST_SUB=	SHARED="" \
+		STATIC="@comment " \
+		SOVERSION_FULL=${DISTVERSION} \
+		SOVERSION_MAJOR=${DISTVERSION:R:R}
+
+post-install:
+	${RM} -r ${STAGEDIR}${PREFIX}/bin/* \
+		 ${STAGEDIR}${PREFIX}/include/* \
+		 ${STAGEDIR}${PREFIX}/lib/cmake
+.endif
+
 .include <bsd.port.mk>
diff --git a/graphics/glslang/distinfo b/graphics/glslang/distinfo
index a7178d6ab2d5..4f76f38411d7 100644
--- a/graphics/glslang/distinfo
+++ b/graphics/glslang/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1765070879
-SHA256 (KhronosGroup-glslang-16.1.0_GH0.tar.gz) = 32c605822ed63a0cdc2d24f318c3d912fa14e58573aff1d8eac0cf69f1a6b6d2
-SIZE (KhronosGroup-glslang-16.1.0_GH0.tar.gz) = 4244796
+TIMESTAMP = 1769372723
+SHA256 (KhronosGroup-glslang-16.2.0_GH0.tar.gz) = 01985335785c97906a91afe3cb5ee015997696181ec6c125bab5555602ba08e2
+SIZE (KhronosGroup-glslang-16.2.0_GH0.tar.gz) = 4294235
diff --git a/graphics/glslang/pkg-plist b/graphics/glslang/pkg-plist
index 5a15b1180e07..bbc9d296283e 100644
--- a/graphics/glslang/pkg-plist
+++ b/graphics/glslang/pkg-plist
@@ -1,26 +1,35 @@
-bin/glslang
-bin/glslangValidator
-include/glslang/Include/ResourceLimits.h
-include/glslang/Include/glslang_c_interface.h
-include/glslang/Include/glslang_c_shader_types.h
-include/glslang/Include/visibility.h
-include/glslang/MachineIndependent/Versions.h
-include/glslang/Public/ResourceLimits.h
-include/glslang/Public/ShaderLang.h
-include/glslang/Public/resource_limits_c.h
-include/glslang/SPIRV/GlslangToSpv.h
-include/glslang/SPIRV/Logger.h
-include/glslang/SPIRV/SpvTools.h
-include/glslang/SPIRV/disassemble.h
-include/glslang/SPIRV/spirv.hpp11
-include/glslang/build_info.h
-lib/cmake/glslang/glslang-config-version.cmake
-lib/cmake/glslang/glslang-config.cmake
-lib/cmake/glslang/glslang-targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/glslang/glslang-targets.cmake
-lib/libGenericCodeGen.a
-lib/libMachineIndependent.a
-lib/libOSDependent.a
-lib/libSPIRV.a
-lib/libglslang-default-resource-limits.a
-lib/libglslang.a
+%%STATIC%%bin/glslang
+%%STATIC%%bin/glslangValidator
+%%STATIC%%include/glslang/Include/ResourceLimits.h
+%%STATIC%%include/glslang/Include/glslang_c_interface.h
+%%STATIC%%include/glslang/Include/glslang_c_shader_types.h
+%%STATIC%%include/glslang/Include/visibility.h
+%%STATIC%%include/glslang/MachineIndependent/Versions.h
+%%STATIC%%include/glslang/Public/ResourceLimits.h
+%%STATIC%%include/glslang/Public/ShaderLang.h
+%%STATIC%%include/glslang/Public/resource_limits_c.h
+%%STATIC%%include/glslang/SPIRV/GlslangToSpv.h
+%%STATIC%%include/glslang/SPIRV/Logger.h
+%%STATIC%%include/glslang/SPIRV/SpvTools.h
+%%STATIC%%include/glslang/SPIRV/disassemble.h
+%%STATIC%%include/glslang/SPIRV/spirv.hpp11
+%%STATIC%%include/glslang/build_info.h
+%%STATIC%%lib/cmake/glslang/glslang-config-version.cmake
+%%STATIC%%lib/cmake/glslang/glslang-config.cmake
+%%STATIC%%lib/cmake/glslang/glslang-targets-%%CMAKE_BUILD_TYPE%%.cmake
+%%STATIC%%lib/cmake/glslang/glslang-targets.cmake
+%%STATIC%%lib/libGenericCodeGen.a
+%%STATIC%%lib/libMachineIndependent.a
+%%STATIC%%lib/libOSDependent.a
+%%STATIC%%lib/libSPIRV.a
+%%SHARED%%lib/libSPIRV.so
+%%SHARED%%lib/libSPIRV.so.%%SOVERSION_MAJOR%%
+%%SHARED%%lib/libSPIRV.so.%%SOVERSION_FULL%%
+%%STATIC%%lib/libglslang-default-resource-limits.a
+%%SHARED%%lib/libglslang-default-resource-limits.so
+%%SHARED%%lib/libglslang-default-resource-limits.so.%%SOVERSION_MAJOR%%
+%%SHARED%%lib/libglslang-default-resource-limits.so.%%SOVERSION_FULL%%
+%%STATIC%%lib/libglslang.a
+%%SHARED%%lib/libglslang.so
+%%SHARED%%lib/libglslang.so.%%SOVERSION_MAJOR%%
+%%SHARED%%lib/libglslang.so.%%SOVERSION_FULL%%