diff --git a/security/ylva/Makefile b/security/ylva/Makefile
index 1b40dedc1e21..a90e55cbf63a 100644
--- a/security/ylva/Makefile
+++ b/security/ylva/Makefile
@@ -1,23 +1,28 @@
 PORTNAME=	ylva
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6
+DISTVERSION=	1.7
 CATEGORIES=	security
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Command line password manager and file encryption program
 
 LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/../LICENSE
+
+LIB_DEPENDS=	libqrcodegen.so:graphics/qr-code-generator
 
 USES=		gmake localbase:ldflags sqlite ssl
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	nrosvall
 
-MAKE_ENV=	MANDIR=${PREFIX}/man
+WRKSRC_SUBDIR=	src
+
+MAKE_ARGS=	CFLAGS="${CFLAGS}"
 
-PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
+PLIST_FILES=	bin/${PORTNAME} share/man/man1/ylva.1.gz
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/security/ylva/distinfo b/security/ylva/distinfo
index ef6e65690e0b..c25226e02a05 100644
--- a/security/ylva/distinfo
+++ b/security/ylva/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587100035
-SHA256 (nrosvall-ylva-v1.6_GH0.tar.gz) = 3d756c06131786b444e39ea6a4b09575d13d0b9db2ec081a6356698f502b4e8d
-SIZE (nrosvall-ylva-v1.6_GH0.tar.gz) = 46748
+TIMESTAMP = 1631465453
+SHA256 (nrosvall-ylva-v1.7_GH0.tar.gz) = 7c557c0c30a4b3bf0a66cec41e909d491bc84a575e9fc7c0942b8d158bf199cc
+SIZE (nrosvall-ylva-v1.7_GH0.tar.gz) = 48529