diff --git a/lang/ficl/Makefile b/lang/ficl/Makefile
index d967b101c5d9..e307a0dae802 100644
--- a/lang/ficl/Makefile
+++ b/lang/ficl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ficl
 PORTVERSION=	4.1.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-all/${PORTNAME}${PORTVERSION:C/([[:digit:]]+\.[[:digit:]]+)\.0/\1/}
 
@@ -14,7 +15,8 @@ LICENSE_NAME=	BSD-style
 LICENSE_TEXT=	Description of the license can be obtained from the following URL: http://ficl.sourceforge.net/license.html
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DATA DOCS
+OPTIONS_DEFAULT=	DATA
 
 MAKE_JOBS_UNSAFE=	YES
 
@@ -25,24 +27,34 @@ USE_LDCONFIG=	YES
 
 ALL_TARGET=	lib ${PORTNAME}
 
-PLIST_FILES=	bin/${PORTNAME} lib/lib${PORTNAME}.so lib/lib${PORTNAME}.so.${PORTVERSION} lib/lib${PORTNAME}.a
+PLIST_FILES=	bin/${PORTNAME} include/ficl.h include/ficlcompatibility.h \
+		include/ficllocal.h include/ficlplatform/unix.h \
+		include/ficltokens.h lib/lib${PORTNAME}.so \
+		lib/lib${PORTNAME}.so.${PORTVERSION} lib/lib${PORTNAME}.a
+PLIST_DIRS=	include/ficlplatform
 
 PORTDOCS=	*
-
-.include <bsd.port.options.mk>
+PORTDATA=	*
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}*.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib
 	cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf lib${PORTNAME}.so.${PORTVERSION} lib${PORTNAME}.so
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/articles ${STAGEDIR}${DOCSDIR}/graphics; \
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/ficlplatform
+	${INSTALL_DATA} ${WRKSRC}/ficlplatform/unix.h ${STAGEDIR}${PREFIX}/include/ficlplatform
+
+	@${MKDIR} ${STAGEDIR}${DATADIR}/ficlplatform 
+	${INSTALL_DATA} ${WRKSRC}/ficlplatform/unix.c ${STAGEDIR}${DATADIR}/ficlplatform
+	(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} xclasses ${STAGEDIR}${DATADIR})
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} softcore ${STAGEDIR}${DATADIR})
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} test ${STAGEDIR}${DATADIR})
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.ico ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/articles/* ${STAGEDIR}${DOCSDIR}/articles
-	${INSTALL_DATA} ${WRKSRC}/doc/graphics/* ${STAGEDIR}${DOCSDIR}/graphics
-.endif
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} articles ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} graphics ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/lang/ficl/pkg-descr b/lang/ficl/pkg-descr
index 8f806fd1ebee..73536dea619c 100644
--- a/lang/ficl/pkg-descr
+++ b/lang/ficl/pkg-descr
@@ -6,5 +6,3 @@ bindings needed by the OS loader.
 
 WWW: http://ficl.sourceforge.net/
 
-Bruce
-bms@spc.org