diff --git a/sysutils/bareos20-server/Makefile.common b/sysutils/bareos20-server/Makefile.common
index 7bad4fc0eb8d..468bc7e31743 100644
--- a/sysutils/bareos20-server/Makefile.common
+++ b/sysutils/bareos20-server/Makefile.common
@@ -1,36 +1,36 @@
 # Created by: Alonso Cardenas <acm@FreeBSD.org>
 post-patch:
 	@${REINPLACE_CMD}  '76,79d' ${WRKSRC}/CMakeLists.txt
 
 post-build:
 .if ${PKGNAMEPREFIX} == "nagios-check_"
 	${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bareos
 .endif
 
 pre-install:
-.if ${PKGNAMESUFFIX} == "-traymonitor"
+.if ${PKGNAMESUFFIX} == "20-traymonitor"
 .	for d in client director monitor storage
 		${MKDIR} ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}
 		${FIND} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d} -type f -name '*.conf' -exec ${MV} -v {} {}.sample \;
 .	endfor
 .endif
 
 do-install:
 .if ${PKGNAMEPREFIX} == "nagios-check_"
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bareos/check_bareos \
 	${STAGEDIR}${PREFIX}/libexec/nagios
 .endif
 .if ${PKGNAMESUFFIX} == "-client-static"
 	${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bareos-fd ${STAGEDIR}${PREFIX}/sbin/bareos-fd-static
 	${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static
 .endif
-.if ${PKGNAMESUFFIX} == "-traymonitor"
+.if ${PKGNAMESUFFIX} == "20-traymonitor"
 # Install config files and preserve existing ones
 .for d in client director monitor storage
 	${INSTALL_SCRIPT} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/
 .endfor
 	${INSTALL_PROGRAM} ${CONFIGURE_WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/core/src/images/bareos_1.png ${STAGEDIR}${PREFIX}/share/pixmaps/bareos-tray-monitor.png
 	${INSTALL_DATA} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.desktop ${STAGEDIR}${DESKTOPDIR}
 .endif
diff --git a/sysutils/bareos20-traymonitor/Makefile b/sysutils/bareos20-traymonitor/Makefile
index 73cf8bec30be..ff5270b3176d 100644
--- a/sysutils/bareos20-traymonitor/Makefile
+++ b/sysutils/bareos20-traymonitor/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	bareos
 PKGNAMESUFFIX=	20-traymonitor
 
 COMMENT=	Backup archiving recovery open sourced (traymonitor)
 
 LIB_DEPENDS+=	libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \
-		libbareos.so:sysutils/bareos-client
+		libbareos.so:sysutils/bareos20-client
 
 CONFLICTS=	bareos-traymonitor bareos18-traymonitor bareos19-traymonitor
 
 USES=		desktop-file-utils gettext-runtime pkgconfig qt:5
 USE_QT=		buildtools_build qmake_build uitools_build gui core
 WITH_BAT=	yes
 
 PLIST=		${.CURDIR}/pkg-plist
 CFLAGS+=	-DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
 
 MASTERDIR=	${.CURDIR}/../../sysutils/bareos20-server
 
 CMAKE_ARGS+=		-Dtraymonitor=yes \
 			-Dbuild-dird=no \
 			-Dbuild-stored=no \
 			-Dclient-only=yes \
 			-Dnls=ON
 
 .include "${MASTERDIR}/Makefile"