diff --git a/lang/cmucl/Makefile b/lang/cmucl/Makefile
index 764b0ce075c4..9aa3fdc61970 100644
--- a/lang/cmucl/Makefile
+++ b/lang/cmucl/Makefile
@@ -15,28 +15,25 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-x86-freebsd_6.3-release
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The CMU implementation of Common Lisp
 
-LIB_DEPENDS=	c.6:${PORTSDIR}/misc/compat6x
+LIB_DEPENDS=	libc.so.6:${PORTSDIR}/misc/compat6x
 
 # 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
-USE_BZIP2=	yes
+USES=		tar:bzip2
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-MAN1=		lisp.1 cmucl.1
 
 PLIST_SUB=	VER=${PORTVERSION}
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/lisp ${PREFIX}/bin
-	cd ${WRKDIR} && ${FIND} lib | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}
-	${INSTALL_MAN} ${WRKDIR}/man/man1/cmucl.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKDIR}/man/man1/lisp.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/doc/cmucl/* ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKDIR}/bin/lisp ${STAGEDIR}${PREFIX}/bin
+	(cd ${WRKDIR} && ${COPYTREE_SHARE} lib ${STAGEDIR}${PREFIX})
+	${INSTALL_MAN} ${WRKDIR}/man/man1/cmucl.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/man/man1/lisp.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/doc/cmucl/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/cmucl/pkg-plist b/lang/cmucl/pkg-plist
index eb43e70a3bb6..5d0230dd3f83 100644
--- a/lang/cmucl/pkg-plist
+++ b/lang/cmucl/pkg-plist
@@ -27,6 +27,8 @@ lib/cmucl/lib/lisp-x87.core
 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%%@dirrm %%DOCSDIR%%