Index: head/security/keybase/Makefile
===================================================================
--- head/security/keybase/Makefile	(revision 496158)
+++ head/security/keybase/Makefile	(revision 496159)
@@ -1,29 +1,30 @@
 # $FreeBSD$
 
 PORTNAME=	keybase
 PORTVERSION=	3.0.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Keybase.io client
+COMMENT=	Keybase.io client and Keybase Filesystem (KBFS)
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 USES=		go
 
 GO_PKGNAME=	github.com/keybase/client/go
-GO_TARGET=	-tags production ${GO_PKGNAME}/keybase
+GO_TARGET=	-tags production ${GO_PKGNAME}/keybase ${GO_PKGNAME}/kbfs/kbfsfuse ${GO_PKGNAME}/kbfs/kbfsgit/git-remote-keybase ${GO_PKGNAME}/kbfs/kbfstool
 WRKSRC_SUBDIR=	go
 
-PLIST_FILES=	bin/keybase
+PLIST_FILES=	bin/git-remote-keybase bin/kbfsfuse bin/kbfstool bin/keybase 
 
 GH_PROJECT=	client
 USE_GITHUB=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e '/+build/ s|$$| freebsd|' ${WRKSRC}/client/platform_specific_ctl_commands_other.go
 	@${REINPLACE_CMD} -e '/+build/ s|,amd64||' ${WRKSRC}/vendor/github.com/keybase/go-ps/process_freebsd.go
 
 .include <bsd.port.mk>
Index: head/security/keybase/pkg-descr
===================================================================
--- head/security/keybase/pkg-descr	(revision 496158)
+++ head/security/keybase/pkg-descr	(revision 496159)
@@ -1,6 +1,14 @@
-Keybase.io CLI client.
+Keybase.io client and Keybase Filesystem (KBFS)
 
 Keybase will be a public directory of publicly auditable public keys. All
 paired, for convenience, with unique usernames.
 
+kbfs is the official Keybase implementation of the client-side code for the
+Keybase filesystem (KBFS). This client allows you to mount KBFS as a proper
+filesystem at some mountpoint on your local device (by default, /keybase/). It
+communicates locally with the Keybase service, and remotely with three types of
+KBFS servers (block servers, metadata servers, and key servers).
+
 WWW: https://keybase.io/docs/command_line
+WWW: https://keybase.io/docs/kbfs
+WWW: https://github.com/keybase/client
Index: head/security/keybase/pkg-message
===================================================================
--- head/security/keybase/pkg-message	(revision 496158)
+++ head/security/keybase/pkg-message	(revision 496159)
@@ -1,7 +1,11 @@
 ######################################################################
                          \!/ WARNING \!/
 
           Uploading private keys is strongly discouraged.
 
                          \!/ WARNING \!/
+
+Notes on how to configure and mount KBFS are available on the FreeBSD wiki:
+https://wiki.FreeBSD.org/Ports/security/keybase
+
 ######################################################################