diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile
index 4b2841d8704e..5e3ea163e258 100644
--- a/security/ca_root_nss/Makefile
+++ b/security/ca_root_nss/Makefile
@@ -1,8 +1,8 @@
-PORTNAME=	ca_root_nss
-PORTVERSION=	${VERSION_NSS}
+PORTNAME=	nss
+PORTVERSION=	3.117
 CATEGORIES=	security
-MASTER_SITES=	MOZILLA/security/nss/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
-DISTNAME=	nss-${VERSION_NSS}${NSS_SUFFIX}
+MASTER_SITES=	MOZILLA/security/nss/releases/NSS_${PORTVERSION:C/[-.]/_/g}_RTM/src
+PKGNAMEPREFIX=	ca_root_
 
 MAINTAINER=	ports-secteam@FreeBSD.org
 COMMENT=	Root certificate bundle from the Mozilla Project
@@ -29,12 +29,11 @@ ETCSYMLINK_CONFLICTS_INSTALL=	ca-roots-[0-9]*
 CERTDIR?=	share/certs
 PLIST_SUB+=	CERTDIR=${CERTDIR}
 
-VERSION_NSS=	3.117
 CERTDATA_TXT_PATH=	lib/ckfw/builtins/certdata.txt
 BUNDLE_PROCESSOR=	MAca-bundle.pl
 
 SUB_FILES=	MAca-bundle.pl pkg-deinstall pkg-install pkg-message
-SUB_LIST=	VERSION_NSS=${VERSION_NSS}
+SUB_LIST=	PORTVERSION=${PORTVERSION}
 
 do-build:
 	@${SETENV} PATH=${LOCALBASE}/bin:$${PATH} \
diff --git a/security/ca_root_nss/files/MAca-bundle.pl.in b/security/ca_root_nss/files/MAca-bundle.pl.in
index b94ca54ba2d1..34ef4eee3200 100644
--- a/security/ca_root_nss/files/MAca-bundle.pl.in
+++ b/security/ca_root_nss/files/MAca-bundle.pl.in
@@ -46,7 +46,7 @@ print <<EOH;
 ##
 ##  It contains certificates trusted for server authentication.
 ##
-##  Extracted from nss-%%VERSION_NSS%%
+##  Extracted from nss-%%PORTVERSION%%
 ##
 EOH
 my $debug = 0;