diff --git a/devel/cl-uffi/Makefile b/devel/cl-uffi/Makefile
index 072fc1c3a0bd..6c3d3882d67f 100644
--- a/devel/cl-uffi/Makefile
+++ b/devel/cl-uffi/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	uffi
-PORTVERSION=	1.4.37
+PORTVERSION=	1.5.9
 CATEGORIES=	devel lisp
 MASTER_SITES=	http://files.b9.com/uffi/
+MASTER_SITE_SUBDIR=	. Archive
 PKGNAMEPREFIX=	cl-
 
 MAINTAINER=	xenophon+fbsdports@irtnog.org
@@ -19,9 +20,14 @@ RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-as
 
 DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 NO_BUILD=	yes
-CL_LIBDIR=	${PREFIX}/lib/common-lisp
+CL_LIBDIR?=	${LOCALBASE}/lib/common-lisp
 
-LPORTDOCS=	README NEWS TODO doc/uffi.pdf doc/html.tar.gz
+LPORTDOCS=	AUTHORS ChangeLog INSTALL LICENSE Makefile.common NEWS README TODO \
+		doc/uffi.pdf doc/html.tar.gz
+LPORTEXAMPLES=	Makefile Makefile.msvc acl-compat-tester.lisp arrays.lisp atoifl.lisp \
+		c-test-fns.c c-test-fns.lisp compress.lisp file-socket.lisp getenv.lisp \
+		gethostname.lisp getshells.lisp gettime.lisp run-examples.lisp \
+		strtol.lisp test-examples.lisp union.lisp
 
 do-install:
 	${MKDIR} ${CL_LIBDIR}/uffi
@@ -30,9 +36,13 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/*.lisp ${CL_LIBDIR}/uffi/src/
 	${LN} -sf ${CL_LIBDIR}/uffi/uffi.asd ${CL_LIBDIR}/system-registry/uffi.asd
 .if !defined(NOPORTDOCS)
-.for i in ${LPORTDOCS}
 	${MKDIR} ${DOCSDIR}
+.for i in ${LPORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+.endfor
+	${MKDIR} ${DOCSDIR}/examples
+.for i in ${LPORTEXAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/examples/${i} ${DOCSDIR}/examples/
 .endfor
 .endif
 
diff --git a/devel/cl-uffi/distinfo b/devel/cl-uffi/distinfo
index 77ead658d923..6dc1d13148cb 100644
--- a/devel/cl-uffi/distinfo
+++ b/devel/cl-uffi/distinfo
@@ -1,3 +1,3 @@
-MD5 (uffi-1.4.37.tar.gz) = 891c71969d1e8e1cc14935aced222f79
-SHA256 (uffi-1.4.37.tar.gz) = 20c645953a7d29b803291f71f178d3879cf8bfe13cda0237a8ffe05d5f1d478c
-SIZE (uffi-1.4.37.tar.gz) = 141671
+MD5 (uffi-1.5.9.tar.gz) = 2a8d3fc21d39dbcf0c84a25b20038abe
+SHA256 (uffi-1.5.9.tar.gz) = dc59eabd76c4fd0f7c5abcd31eedda5fe016a33d11bb929537ce08632c1b174b
+SIZE (uffi-1.5.9.tar.gz) = 143829
diff --git a/devel/cl-uffi/pkg-plist b/devel/cl-uffi/pkg-plist
index 476c6c995e91..12cd11ab7838 100644
--- a/devel/cl-uffi/pkg-plist
+++ b/devel/cl-uffi/pkg-plist
@@ -9,11 +9,34 @@ lib/common-lisp/uffi/src/package.lisp
 lib/common-lisp/uffi/src/primitives.lisp
 lib/common-lisp/uffi/src/readmacros-mcl.lisp
 lib/common-lisp/uffi/src/strings.lisp
-%%PORTDOCS%%share/doc/cl-uffi/README
+%%PORTDOCS%%share/doc/cl-uffi/AUTHORS
+%%PORTDOCS%%share/doc/cl-uffi/ChangeLog
+%%PORTDOCS%%share/doc/cl-uffi/INSTALL
+%%PORTDOCS%%share/doc/cl-uffi/LICENSE
+%%PORTDOCS%%share/doc/cl-uffi/Makefile.common
 %%PORTDOCS%%share/doc/cl-uffi/NEWS
+%%PORTDOCS%%share/doc/cl-uffi/README
 %%PORTDOCS%%share/doc/cl-uffi/TODO
+%%PORTDOCS%%share/doc/cl-uffi/examples/Makefile
+%%PORTDOCS%%share/doc/cl-uffi/examples/Makefile.msvc
+%%PORTDOCS%%share/doc/cl-uffi/examples/acl-compat-tester.lisp
+%%PORTDOCS%%share/doc/cl-uffi/examples/arrays.lisp
+%%PORTDOCS%%share/doc/cl-uffi/examples/atoifl.lisp
+%%PORTDOCS%%share/doc/cl-uffi/examples/c-test-fns.c
+%%PORTDOCS%%share/doc/cl-uffi/examples/c-test-fns.lisp
+%%PORTDOCS%%share/doc/cl-uffi/examples/compress.lisp
+%%PORTDOCS%%share/doc/cl-uffi/examples/file-socket.lisp
+%%PORTDOCS%%share/doc/cl-uffi/examples/getenv.lisp
+%%PORTDOCS%%share/doc/cl-uffi/examples/gethostname.lisp
+%%PORTDOCS%%share/doc/cl-uffi/examples/getshells.lisp
+%%PORTDOCS%%share/doc/cl-uffi/examples/gettime.lisp
+%%PORTDOCS%%share/doc/cl-uffi/examples/run-examples.lisp
+%%PORTDOCS%%share/doc/cl-uffi/examples/strtol.lisp
+%%PORTDOCS%%share/doc/cl-uffi/examples/test-examples.lisp
+%%PORTDOCS%%share/doc/cl-uffi/examples/union.lisp
 %%PORTDOCS%%share/doc/cl-uffi/uffi.pdf
 %%PORTDOCS%%share/doc/cl-uffi/html.tar.gz
 @dirrm lib/common-lisp/uffi/src
 @dirrm lib/common-lisp/uffi
+@dirrm share/doc/cl-uffi/examples
 @dirrm share/doc/cl-uffi