diff --git a/security/Makefile b/security/Makefile
index 730aeceb9943..ace7b829530a 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -359,6 +359,7 @@
     SUBDIR += openscep
     SUBDIR += openssh-askpass
     SUBDIR += openssh-portable
+    SUBDIR += openssh-portable-base
     SUBDIR += openssl
     SUBDIR += openssl_tpm_engine
     SUBDIR += openvas-client
diff --git a/security/openssh-portable-base/Makefile b/security/openssh-portable-base/Makefile
new file mode 100644
index 000000000000..e2463c200ace
--- /dev/null
+++ b/security/openssh-portable-base/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+PORTNAME=	openssh
+PKGNAMESUFFIX=	-portable-base
+
+MASTERDIR=	${.CURDIR}/../openssh-portable
+
+OPTIONS_SLAVE=		OVERWRITE_BASE
+
+.include "${MASTERDIR}/Makefile"
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index 892f46c82150..26180e82ad6c 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -8,7 +8,7 @@ PORTEPOCH=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	${MASTER_SITE_OPENBSD}
 MASTER_SITE_SUBDIR=	OpenSSH/portable
-PKGNAMESUFFIX=	-portable
+PKGNAMESUFFIX?=	-portable
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	The portable version of OpenBSD's OpenSSH