diff --git a/security/1password-client2/Makefile b/security/1password-client2/Makefile
index 1bfc6dd58a28..6d2c2afda5a6 100644
--- a/security/1password-client2/Makefile
+++ b/security/1password-client2/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	1password-client2
 DISTVERSION=	2.5.1
 CATEGORIES=	security
-MASTER_SITES=	https://cache.agilebits.com/dist/1P/op2/pkg/v${DISTVERSION}/ 
+MASTER_SITES=	https://cache.agilebits.com/dist/1P/op2/pkg/v${DISTVERSION}/
 
 MAINTAINER=	ler@FreeBSD.org
 COMMENT=	1Password CLI client
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386
 
 USES=		zip
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	bin/op
-CONFLICTS_INSTALL=	security/op security/1password-client
+PLIST_FILES=		bin/op
+CONFLICTS_INSTALL=	security/1password-client security/op
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/op ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/op \
+		${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 DISTNAME=	op_freebsd_amd64_v${DISTVERSION}
 .elif ${ARCH} == armv6 || ${ARCH} == armv7
 DISTNAME=	op_freebsd_arm_v${DISTVERSION}
 .elif ${ARCH} == aarch64
 DISTNAME=	op_freebsd_arm64_v${DISTVERSION}
 .elif ${ARCH} == i386
 DISTNAME=	op_freebsd_386_v${DISTVERSION}
 .endif
 
 .if ${.TARGETS} == "makesum"
-DISTFILES=	op_freebsd_amd64_v${DISTVERSION}${EXTRACT_SUFX} \
+DISTFILES=	op_freebsd_386_v${DISTVERSION}${EXTRACT_SUFX} \
+		op_freebsd_amd64_v${DISTVERSION}${EXTRACT_SUFX} \
 		op_freebsd_arm64_v${DISTVERSION}${EXTRACT_SUFX} \
-		op_freebsd_arm_v${DISTVERSION}${EXTRACT_SUFX} \
-		op_freebsd_386_v${DISTVERSION}${EXTRACT_SUFX}
+		op_freebsd_arm_v${DISTVERSION}${EXTRACT_SUFX}
 .endif
 
 .include <bsd.port.post.mk>