diff -Nru /usr/local/poudriere/ports/official/lang/cmucl/Makefile /usr/local/poudriere/ports/experimental/lang/cmucl/Makefile
--- /usr/local/poudriere/ports/official/lang/cmucl/Makefile	2016-04-01 16:08:37.000000000 +0200
+++ /usr/local/poudriere/ports/experimental/lang/cmucl/Makefile	2018-10-17 14:54:47.129747000 +0200
@@ -2,40 +2,43 @@
 # $FreeBSD: head/lang/cmucl/Makefile 412347 2016-04-01 14:08:37Z mat $
 
 PORTNAME=	cmucl
-PORTVERSION=	19f
-PORTREVISION=	2
+DISTVERSION=	21b
 CATEGORIES=	lang lisp
-MASTER_SITES=	http://common-lisp.net/pub/project/cmucl/release/${PORTVERSION}/ \
-		http://www.pmsf.de/pub/cmucl/release/${PORTVERSION}/ \
-		ftp://ftp.averillpark.net/cmucl/release/${PORTVERSION}/ \
-		ftp://ftp.linux.org.uk/pub/lisp/cmucl/release/${PORTVERSION}/ \
-		ftp://ftp.tepus.com/pub/project/cmucl/release/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-x86-freebsd_6.3-release
+MASTER_SITES=	https://common-lisp.net/project/cmucl/downloads/release/${DISTVERSION}/ \
+		http://cmucl.org/downloads/release/${DISTVERSION}/ \
+		https://pmsf.eu/pub/cmucl/release/${DISTVERSION}/ \
+		http://www.rgrjr.com/cmucl/downloads/release/${DISTVERSION}/
+DISTNAME=	${PORTNAME}-${DISTVERSION}-x86-FreeBSD
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The CMU implementation of Common Lisp
+MAINTAINER=	phascolarctos@FreeBSD.org
+COMMENT=	CMU implementation of Common Lisp
 
-LIB_DEPENDS=	libc.so.6:misc/compat6x
+LICENSE=	PD
+
+USES=		tar:bzip2
 
 # To make available on other archs, has to be cross-compiled (there is a
 # script for this, but a configuration file has to be written).
 IA32_BINARY_PORT=	yes
-USES=		tar:bzip2
+
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-PLIST_SUB=	VER=${PORTVERSION}
+PLIST_SUB=	VER=${DISTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 
+INFO=	asdf
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/lisp ${STAGEDIR}${PREFIX}/bin
 	cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_MAN} ${WRKSRC}/man/man1/cmucl.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/man1/lisp.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${MV} ${STAGEDIR}${PREFIX}/lib/cmucl/lib/contrib/asdf/doc/asdf.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/cmucl/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff -Nru /usr/local/poudriere/ports/official/lang/cmucl/distinfo /usr/local/poudriere/ports/experimental/lang/cmucl/distinfo
--- /usr/local/poudriere/ports/official/lang/cmucl/distinfo	2014-01-22 16:30:13.000000000 +0100
+++ /usr/local/poudriere/ports/experimental/lang/cmucl/distinfo	2018-10-06 17:48:15.560012000 +0200
@@ -1,2 +1,3 @@
-SHA256 (cmucl-19f-x86-freebsd_6.3-release.tar.bz2) = d627940a9b30e831acf684ed0b17419d4299f112add208782d9f6f503216103e
-SIZE (cmucl-19f-x86-freebsd_6.3-release.tar.bz2) = 15213148
+TIMESTAMP = 1538840895
+SHA256 (cmucl-21b-x86-FreeBSD.tar.bz2) = 2c9fbdaed398e61dbe9c439405ae79d28e112423a7c0376de6d2a6c62f4f8918
+SIZE (cmucl-21b-x86-FreeBSD.tar.bz2) = 10680134
diff -Nru /usr/local/poudriere/ports/official/lang/cmucl/pkg-plist /usr/local/poudriere/ports/experimental/lang/cmucl/pkg-plist
--- /usr/local/poudriere/ports/official/lang/cmucl/pkg-plist	2014-10-27 16:23:30.000000000 +0100
+++ /usr/local/poudriere/ports/experimental/lang/cmucl/pkg-plist	2018-10-17 14:51:39.338338000 +0200
@@ -3,31 +3,71 @@
 lib/cmucl/internals.inc
 lib/cmucl/lib/config
 lib/cmucl/lib/config.lisp
-lib/cmucl/lib/generic-site.lisp
-lib/cmucl/lib/load-foreign.csh
+lib/cmucl/lib/contrib/asdf/asdf.lisp
+lib/cmucl/lib/contrib/asdf/asdf.sse2f
+lib/cmucl/lib/contrib/asdf/doc/asdf.html
+lib/cmucl/lib/contrib/asdf/doc/asdf.pdf
+lib/cmucl/lib/contrib/defsystem/defsystem.lisp
+lib/cmucl/lib/contrib/defsystem/defsystem.sse2f
+lib/cmucl/lib/contrib/load-unix.lisp
+lib/cmucl/lib/contrib/unix/unix.lisp
+lib/cmucl/lib/contrib/unix/unix.sse2f
+lib/cmucl/lib/ext-formats/aliases
+lib/cmucl/lib/ext-formats/ascii.lisp
+lib/cmucl/lib/ext-formats/beta-gk.lisp
+lib/cmucl/lib/ext-formats/cp1250.lisp
+lib/cmucl/lib/ext-formats/cp1251.lisp
+lib/cmucl/lib/ext-formats/cp1252.lisp
+lib/cmucl/lib/ext-formats/cp1253.lisp
+lib/cmucl/lib/ext-formats/cp1254.lisp
+lib/cmucl/lib/ext-formats/cp1255.lisp
+lib/cmucl/lib/ext-formats/cp1256.lisp
+lib/cmucl/lib/ext-formats/cp1257.lisp
+lib/cmucl/lib/ext-formats/cp1258.lisp
+lib/cmucl/lib/ext-formats/cr.lisp
+lib/cmucl/lib/ext-formats/crlf.lisp
+lib/cmucl/lib/ext-formats/euc-kr.lisp
+lib/cmucl/lib/ext-formats/final-sigma.lisp
 lib/cmucl/lib/ext-formats/iso8859-1.lisp
+lib/cmucl/lib/ext-formats/iso8859-10.lisp
+lib/cmucl/lib/ext-formats/iso8859-13.lisp
+lib/cmucl/lib/ext-formats/iso8859-14.lisp
+lib/cmucl/lib/ext-formats/iso8859-15.lisp
+lib/cmucl/lib/ext-formats/iso8859-2.lisp
+lib/cmucl/lib/ext-formats/iso8859-3.lisp
+lib/cmucl/lib/ext-formats/iso8859-4.lisp
+lib/cmucl/lib/ext-formats/iso8859-5.lisp
+lib/cmucl/lib/ext-formats/iso8859-6.lisp
+lib/cmucl/lib/ext-formats/iso8859-7.lisp
+lib/cmucl/lib/ext-formats/iso8859-8.lisp
+lib/cmucl/lib/ext-formats/iso8859-9.lisp
+lib/cmucl/lib/ext-formats/koi8-r.lisp
+lib/cmucl/lib/ext-formats/mac-cyrillic.lisp
+lib/cmucl/lib/ext-formats/mac-greek.lisp
+lib/cmucl/lib/ext-formats/mac-icelandic.lisp
+lib/cmucl/lib/ext-formats/mac-latin2.lisp
+lib/cmucl/lib/ext-formats/mac-roman.lisp
+lib/cmucl/lib/ext-formats/mac-turkish.lisp
+lib/cmucl/lib/ext-formats/unidata.bin
+lib/cmucl/lib/ext-formats/utf-16-be.lisp
+lib/cmucl/lib/ext-formats/utf-16-le.lisp
+lib/cmucl/lib/ext-formats/utf-16.lisp
+lib/cmucl/lib/ext-formats/utf-32-be.lisp
+lib/cmucl/lib/ext-formats/utf-32-le.lisp
+lib/cmucl/lib/ext-formats/utf-32.lisp
 lib/cmucl/lib/ext-formats/utf-8.lisp
 lib/cmucl/lib/ext-formats/void.lisp
-lib/cmucl/lib/subsystems/gray-streams-library.sse2f
+lib/cmucl/lib/generic-site.lisp
+lib/cmucl/lib/lisp-sse2.core
+lib/cmucl/lib/load-foreign.csh
 lib/cmucl/lib/subsystems/gray-compat-library.sse2f
-lib/cmucl/lib/subsystems/simple-streams-library.sse2f
+lib/cmucl/lib/subsystems/gray-streams-library.sse2f
 lib/cmucl/lib/subsystems/iodefs-library.sse2f
-lib/cmucl/lib/subsystems/external-formats-library.sse2f
-lib/cmucl/lib/subsystems/gray-streams-library.x86f
-lib/cmucl/lib/subsystems/gray-compat-library.x86f
-lib/cmucl/lib/subsystems/simple-streams-library.x86f
-lib/cmucl/lib/subsystems/iodefs-library.x86f
-lib/cmucl/lib/subsystems/external-formats-library.x86f
-lib/cmucl/lib/ext-formats/crlf.lisp
-lib/cmucl/lib/ext-formats/utf-16-be.lisp
-lib/cmucl/lib/ext-formats/utf-16-le.lisp
-lib/cmucl/lib/ext-formats/aliases
-lib/cmucl/lib/lisp-sse2.core
-lib/cmucl/lib/lisp-x87.core
+lib/cmucl/lib/subsystems/simple-streams-library.sse2f
 lib/cmucl/lisp.map
 lib/cmucl/lisp.nm
 lib/cmucl/sample-wrapper
 man/man1/cmucl.1.gz
 man/man1/lisp.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/release-19f.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-%%VER%%.txt