diff --git a/lang/yorick/Makefile b/lang/yorick/Makefile
index 160434f45087..29a306cd6d71 100644
--- a/lang/yorick/Makefile
+++ b/lang/yorick/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Yorick
-# Date created:         26 Oct 97
-# Whom:                 Pedro Giffuni <giffunip@asme.org>
-#
+# Created by: Pedro Giffuni <giffunip@asme.org>
 # $FreeBSD$
-#
 
 PORTNAME=	yorick
 PORTVERSION=	2.1.06
@@ -12,47 +8,47 @@ MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	johans@FreeBSD.org
-COMMENT=	Interpreted language and scientific graphics
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+COMMENT=	Interpreted language for scientific simulations
 
 USE_XORG=	x11
 MAKE_ARGS=	Y_HOME=relocatable Y_DOCDIR=/dev/null
 MAN1=		yorick.1 gist.1
 INFO=		yorick
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+
 PORTDOCS=	FILE_FORMATS README drat.doc graph.doc hex.doc \
 		library.doc math.doc refs.pdf refs.tex std.doc \
 		yorick.pdf yorick.tex
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 do-configure:
 	@(cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} \
 		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ysite config)
 
 post-build:
-	cd ${WRKSRC}/doc; make yorick.info
+	${MAKE} -C ${WRKSRC}/doc yorick.info
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/emacs/yorick.el ${WRKSRC}/relocatable
 	@${RM} -rf ${WRKSRC}/relocatable/doc
 	@${RM} -rf ${PREFIX}/lib/${PORTNAME}
 	@${MV} ${WRKSRC}/relocatable ${PREFIX}/lib/${PORTNAME}
-.for file in gist yorick
-	${INSTALL_MAN} ${WRKSRC}/doc/${file}.1 ${PREFIX}/man/man1
-	@${STRIP_CMD} ${PREFIX}/lib/${PORTNAME}/bin/${file}
-	@${LN} -sf ${PREFIX}/lib/${PORTNAME}/bin/${file} ${PREFIX}/bin/${file}
+.for f in gist yorick
+	${INSTALL_MAN} ${WRKSRC}/doc/${f}.1 ${MANPREFIX}/man/man1
+	@${STRIP_CMD} ${PREFIX}/lib/${PORTNAME}/bin/${f}
+	@${LN} -sf ${PREFIX}/lib/${PORTNAME}/bin/${f} ${PREFIX}/bin/${f}
 .endfor
 	@${STRIP_CMD} ${PREFIX}/lib/${PORTNAME}/lib/codger
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
 	@${LN} -sf ${DOCSDIR} ${PREFIX}/lib/${PORTNAME}/doc
 .endif
-	for f in ${WRKSRC}/doc/yorick.info*; do \
-	  ${INSTALL_DATA} $$f ${PREFIX}/${INFO_PATH}; \
-	done
+	${INSTALL_DATA} ${WRKSRC}/doc/yorick.info* ${PREFIX}/${INFO_PATH}
 
 # Hidden by default: this requires an X terminal to run all checks
 .ifdef MAINTAINER_MODE