diff --git a/devel/cl-uffi/Makefile b/devel/cl-uffi/Makefile
index 6b97b4b2ab40..3090631f7f88 100644
--- a/devel/cl-uffi/Makefile
+++ b/devel/cl-uffi/Makefile
@@ -15,28 +15,23 @@ NO_BUILD=	yes
 
 USE_ASDF=	yes
 
-NO_STAGE=	yes
-do-install:
-	@${MKDIR} ${ASDF_PATHNAME}
-	@${MKDIR} ${ASDF_PATHNAME}/src
-	@${INSTALL_DATA} ${WRKSRC}/uffi.asd   ${ASDF_PATHNAME}
-	@${INSTALL_DATA} ${WRKSRC}/src/*.lisp ${ASDF_PATHNAME}/src
-	@${LN} -sf ${ASDF_PATHNAME}/*.asd ${ASDF_REGISTRY}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${TAR} -C ${DOCSDIR} -xf ${WRKSRC}/doc/html.tar.gz
-	@${CHOWN} ${DOCOWN}:${DOCGRP} ${DOCSDIR}/html/*
-	@${CHMOD} ${DOCMODE}  ${DOCSDIR}/html/*
-	@${INSTALL_DATA} ${WRKSRC}/doc/uffi.pdf ${DOCSDIR}
-.for FILE in AUTHORS ChangeLog INSTALL LICENSE NEWS README TODO
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-.endif
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
-.endif
+do-install:
+	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME} ${STAGEDIR}${ASDF_REGISTRY}
+	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME}/src
+	@${INSTALL_DATA} ${WRKSRC}/uffi.asd   ${STAGEDIR}${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/src/*.lisp ${STAGEDIR}${ASDF_PATHNAME}/src
+	@${LN} -sf ${ASDF_PATHNAME}/uffi.asd ${STAGEDIR}${ASDF_REGISTRY}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${TAR} -C ${STAGEDIR}${DOCSDIR} -xf ${WRKSRC}/doc/html.tar.gz --no-same-owner
+	@${CHMOD} ${DOCMODE}  ${STAGEDIR}${DOCSDIR}/html/*
+	@${INSTALL_DATA} ${WRKSRC}/doc/uffi.pdf ${STAGEDIR}${DOCSDIR}
+.for FILE in AUTHORS ChangeLog INSTALL LICENSE NEWS README TODO
+	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
+.endfor
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>