diff --git a/Mk/Uses/kmod.mk b/Mk/Uses/kmod.mk
index a28077e67697..36bc49462fdf 100644
--- a/Mk/Uses/kmod.mk
+++ b/Mk/Uses/kmod.mk
@@ -25,6 +25,8 @@ IGNORE=	requires kernel source files in SRC_BASE=${SRC_BASE}
 
 CATEGORIES+=	kld
 
+_OS_SUFX?=	.${OSVERSION}
+
 PIE_UNSAFE=	kernel modules are not executable
 SSP_UNSAFE=	kernel module supports SSP natively
 
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 360fff6fc4cd..01dc08c265f5 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1386,7 +1386,7 @@ PORTEPOCH?=		0
 _SUF2=	,${PORTEPOCH}
 .    endif
 
-PKGVERSION=	${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2}
+PKGVERSION=	${PORTVERSION:C/[-_,]/./g}${_OS_SUFX}${_SUF1}${_SUF2}
 PKGNAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION}
 DISTVERSIONFULL=	${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
 DISTNAME?=	${PORTNAME}-${DISTVERSIONFULL}