diff --git a/devel/p4api/Makefile b/devel/p4api/Makefile
index dc68a5ed4b58..31f911a02c16 100644
--- a/devel/p4api/Makefile
+++ b/devel/p4api/Makefile
@@ -1,54 +1,57 @@
 PORTNAME=	p4api
 PORTVERSION=	${YEAR}.${MAJOR}.${MINOR}
 CATEGORIES=	devel
 # Perforce does not version their distfiles when they patch.
 # This does not play well with FreeBSD's conventions.
 MASTER_SITES=	https://ftp.perforce.com/perforce/${P4VERSION}/bin.tools/p4source${EXTRACT_SUFX}?dummy=/ \
-		https://hesiod.org/distfiles/perforce-${MINOR}/p4source${EXTRACT_SUFX}?dummy=/
+		https://hesiod.org/distfiles/perforce
 DISTNAME=	p4source-${MINOR}
 
 MAINTAINER=	antonfb@hesiod.org
 COMMENT=	Perforce API (static libraries and header files)
 WWW=		https://www.perforce.com/products/helix-core
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${JAM}:devel/jam
 
 USES=		tar:tgz
 
 PATCHDIR=	${.CURDIR}/../p4/files
 
 DISTINFO_FILE=	${.CURDIR}/../p4/distinfo
 
 OPTIONS_DEFINE=	EXAMPLES
 
 WRKSRC=		${WRKDIR}/p4source-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 .include "../p4/Makefile.inc"
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} C++="${CXX}" C++FLAGS="${CXXFLAGS}" \
 		CCFLAGS="${CFLAGS}" \
 		LINKFLAGS="${LDFLAGS}" \
 		OSVER=${OSVER} \
 		API=1 \
 		SSL="yes" \
+		SSLVER="1.1.1" \
 		SSLLIB=-lssl \
 		CRYPTOLIB=-lcrypto \
 		TYPE=pic \
-		${JAM} -dx -sUSE_EXTENSIONS=0 -j${MAKE_JOBS_NUMBER} p4api p4api.tar
+		USE_EXTENSIONS=0 \
+		USE_OPTIMIZED_ZLIB=0 \
+		${JAM} -dx -j${MAKE_JOBS_NUMBER} p4api p4api.tar
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/perforce
 	cd ${WRKSRC}/p4-bin/bin.pic/p4api-*/include/p4 && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/perforce
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/perforce
 	cd ${WRKSRC}/p4-bin/bin.pic/p4api-*/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/perforce
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/p4-bin/bin.pic/p4api-*/sample && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
diff --git a/devel/p4api/pkg-plist b/devel/p4api/pkg-plist
index fc849b828c2e..057be6e949e5 100644
--- a/devel/p4api/pkg-plist
+++ b/devel/p4api/pkg-plist
@@ -1,92 +1,93 @@
 include/perforce/base64.h
 include/perforce/charcvt.h
 include/perforce/charman.h
 include/perforce/charset.h
 include/perforce/clientapi.h
 include/perforce/clientmerge.h
 include/perforce/clientprog.h
 include/perforce/clientresolvea.h
 include/perforce/clientscript.h
 include/perforce/clientuser.h
 include/perforce/datetime.h
 include/perforce/debug.h
 include/perforce/diff.h
 include/perforce/diffmerge.h
 include/perforce/dmextension.h
 include/perforce/dmextension_c.h
 include/perforce/dmextensiondata.h
 include/perforce/dmextensiondata_c.h
 include/perforce/echoctl.h
 include/perforce/enviro.h
 include/perforce/error.h
 include/perforce/errorlog.h
 include/perforce/errornum.h
 include/perforce/filesys.h
 include/perforce/handler.h
 include/perforce/hostenv.h
 include/perforce/i18napi.h
 include/perforce/ident.h
 include/perforce/ignore.h
 include/perforce/keepalive.h
 include/perforce/macfile.h
 include/perforce/macutil.h
 include/perforce/malloc_override.h
 include/perforce/mangle.h
 include/perforce/mapapi.h
 include/perforce/md5.h
 include/perforce/msgclient.h
 include/perforce/msgdb.h
 include/perforce/msgdm.h
 include/perforce/msgdm2.h
 include/perforce/msggraph.h
 include/perforce/msghelp.h
 include/perforce/msglbr.h
 include/perforce/msgos.h
 include/perforce/msgrpc.h
 include/perforce/msgscript.h
 include/perforce/msgserver.h
 include/perforce/msgserver2.h
 include/perforce/msgspec.h
 include/perforce/msgsupp.h
 include/perforce/netbuffer.h
 include/perforce/netconnect.h
 include/perforce/netportparser.h
 include/perforce/ntmangle.h
 include/perforce/ntservice.h
 include/perforce/options.h
 include/perforce/p4libs.h
 include/perforce/p4tags.h
 include/perforce/pathsys.h
 include/perforce/runcmd.h
 include/perforce/sanitizers.h
 include/perforce/serverhelperapi.h
 include/perforce/sha1.h
 include/perforce/sha256.h
 include/perforce/signaler.h
 include/perforce/spec.h
 include/perforce/stdhdrs.h
 include/perforce/strarray.h
 include/perforce/strbuf.h
 include/perforce/strdict.h
 include/perforce/strops.h
 include/perforce/strtable.h
 include/perforce/strxml.h
 include/perforce/threading.h
 include/perforce/ticket.h
 include/perforce/validate.h
 include/perforce/vararray.h
 include/perforce/web822.h
 lib/perforce/libclient.a
 lib/perforce/libp4api.a
 lib/perforce/libp4script.a
 lib/perforce/libp4script_c.a
+lib/perforce/libp4script_cstub.a
 lib/perforce/libp4script_curl.a
 lib/perforce/libp4script_sqlite.a
 lib/perforce/librpc.a
 lib/perforce/libsupp.a
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Jamfile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Jamrules
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Version
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clientuser.cc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/p4api.cc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/p4dvcsapi.cc