diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -2,7 +2,7 @@
 DISTVERSIONPREFIX=	OTP-
 DISTVERSION=	25.3.1
 PORTEPOCH=	4
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	lang parallel java
 DIST_SUBDIR=	erlang
 
@@ -29,7 +29,7 @@
 		--enable-kernel-poll \
 		--enable-smp-support \
 		--enable-threads
-MAKE_ARGS=	all
+MAKE_ARGS=	DOC_TARGETS='chunks $(HTML_DOC_TARGET) $(PDF_DOC_TARGET)'
 
 SUB_FILES=	pkg-message
 SUB_LIST=	TOOLS_VSN=${TOOLS_VSN}
@@ -41,9 +41,9 @@
 SNMP_VSN=	5.13.5
 TOOLS_VSN=	3.5.3
 
-OPTIONS_DEFINE=		CHUNKS CORBA DIRTY DTRACE FOP JAVA KQUEUE MANPAGES ODBC \
+OPTIONS_DEFINE=		CORBA DIRTY DTRACE FOP JAVA KQUEUE MANPAGES ODBC \
 			OPENSSL PDF SCTP SHARING WX
-OPTIONS_DEFAULT=	CHUNKS CORBA DIRTY DTRACE KQUEUE MANPAGES OPENSSL SCTP
+OPTIONS_DEFAULT=	CORBA DIRTY DTRACE KQUEUE MANPAGES OPENSSL SCTP
 
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
@@ -59,7 +59,6 @@
 OPTIONS_EXCLUDE_riscv64=	DTRACE
 OPTIONS_SUB=	yes
 
-CHUNKS_DESC=	Enable in-line documentation in Erlang console
 CORBA_DESC=	Enable Corba support
 DIRTY_DESC=	Enable dirty schedulers
 FOP_DESC=	Build full documentation with Apache FOP
@@ -73,8 +72,6 @@
 # probes fixed does not match the number of defined probes (54 != 132,
 # respectively)" you probably misconfigured DTrace in some way.
 
-CHUNKS_MAKE_ARGS+=		DOC_TARGETS=chunks \
-				docs
 DIRTY_CONFIGURE_WITH=		dirty-schedulers
 DTRACE_CONFIGURE_WITH=		dynamic-trace=dtrace
 DTRACE_CFLAGS=			-fno-omit-frame-pointer
@@ -82,6 +79,7 @@
 FOP_PREVENTS=			MANPAGES
 FOP_BUILD_DEPENDS=		fop:textproc/fop \
 				xsltproc:textproc/libxslt
+FOP_VARS=			HTML_DOC_TARGET=html
 JAVA_CONFIGURE_WITH=		javac
 JAVA_CONFIGURE_ENV=		ac_cv_prog_JAVAC="${JAVAC}"
 JAVA_VARS=			USE_JAVA=yes
@@ -95,6 +93,7 @@
 OPENSSL_USES=			ssl
 OPENSSL_CONFIGURE_WITH=		ssl=${OPENSSLBASE}
 PDF_IMPLIES=			FOP
+PDF_VARS=			PDF_DOC_TARGET=pdf
 SCTP_CONFIGURE_ENABLE=		sctp
 SHARING_CONFIGURE_ENABLE=	sharing-preserving
 WX_USES=			gl
@@ -145,24 +144,32 @@
 post-configure-ODBC-off:
 	echo "disabled by port options" > ${WRKSRC}/lib/odbc/SKIP
 
+do-build:
+	cd ${WRKSRC} && ${DO_MAKE_BUILD} ${ALL_TARGET}
+	cd ${WRKSRC} && ${DO_MAKE_BUILD} docs
+
 post-build-CORBA-on:
 	cd ${WRKSRC_corba} && \
 		${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} \
 		${MAKE_CMD}
+.if ${PORT_OPTIONS:MFOP}
+	cd ${WRKSRC_corba} && \
+		${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} \
+		${MAKE_CMD} docs
+.endif
 
 # The man-pages are put (in spite of FreeBSD's port convention) in a private
 # subdir. This is to avoid cluttering up the man page name space. Also the
 # Erlang man pages are more of internal documentation using the man format than
 # actual system man pages. (erl.1 and epmd.1 perhaps being the exception).
 
-post-build-FOP-on:
-	@cd ${WRKSRC} && \
-		${MAKE_CMD} docs
-.if ${PORT_OPTIONS:MCORBA}
-	cd ${WRKSRC_corba} && \
-		${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} \
-		${MAKE_CMD} docs
-.endif
+do-install:
+	cd ${WRKSRC} && \
+	  ${SETENV} ${MAKE_ENV} ${FAKEROOT} \
+	  ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
+	cd ${WRKSRC} && \
+	  ${SETENV} ${MAKE_ENV} ${FAKEROOT} \
+	  ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-docs
 
 post-install:
 	${LN} -sf ../lib/${ERLANG_LIB}/lib/erl_interface-${EI_VSN}/bin/erl_call \