diff --git a/security/lastpass-cli/Makefile b/security/lastpass-cli/Makefile
index b7e4d0720407..c31b1c555915 100644
--- a/security/lastpass-cli/Makefile
+++ b/security/lastpass-cli/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lastpass-cli
-PORTVERSION=	1.1.2
+PORTVERSION=	1.2.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
-USES=		cmake pkgconfig ssl
+USES=		cmake:noninja pkgconfig ssl
 USE_GNOME=	libxml2
 
 USE_GITHUB=	YES
@@ -23,6 +23,8 @@ GH_ACCOUNT=	lastpass
 PLIST_FILES=	bin/lpass share/bash-completion/completions/lpass
 CMAKE_ARGS=	-DBASH_COMPLETION_COMPLETIONSDIR=${PREFIX}/share/bash-completion/completions
 
+TEST_TARGET=	lpass-test test
+
 OPTIONS_DEFINE=		MANPAGES PINENTRY XCLIP XSEL
 OPTIONS_DEFAULT=	MANPAGES
 PINENTRY_DESC=		Use pinentry for password entry
@@ -42,6 +44,8 @@ XSEL_RUN_DEPENDS=	xsel:x11/xsel
 post-extract:
 	@${REINPLACE_CMD} -e 's/-Wno-language-extension-token//g' \
 		${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} -e 's/build\/lpass-test/lpass-test/' \
+		${WRKSRC}/test/include.sh
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lpass
diff --git a/security/lastpass-cli/distinfo b/security/lastpass-cli/distinfo
index 52551377bff3..82af4d561400 100644
--- a/security/lastpass-cli/distinfo
+++ b/security/lastpass-cli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486849098
-SHA256 (lastpass-lastpass-cli-v1.1.2_GH0.tar.gz) = bc737d8e6d713c8aecdfb7f34b29aa9a8ae9b1e9ba80b31059686b18591a8c39
-SIZE (lastpass-lastpass-cli-v1.1.2_GH0.tar.gz) = 102796
+TIMESTAMP = 1498689347
+SHA256 (lastpass-lastpass-cli-v1.2.1_GH0.tar.gz) = 1a49a37a67a973296e218306e6d36c9383347b1833e5a878ebc08355b1c77456
+SIZE (lastpass-lastpass-cli-v1.2.1_GH0.tar.gz) = 108780
diff --git a/security/lastpass-cli/pkg-message b/security/lastpass-cli/pkg-message
index 1f4feb0ac8aa..cf8263c12cda 100644
--- a/security/lastpass-cli/pkg-message
+++ b/security/lastpass-cli/pkg-message
@@ -14,12 +14,3 @@ lpass.* or within your $SECURE_TMPDIR.  For example, with vim:
 
 	autocmd BufRead lpass.* setlocal noundofile nowritebackup noswapfile
 
-
-===============================================================================
-Other steps
-===============================================================================
-
-lpass requires /proc to be mounted for correct operation.  To enable it add
-the following to /etc/fstab and run 'mount /proc':
-
-	proc		/proc		procfs	rw		0	0