diff --git a/mail/claws-mail-plugins/Makefile b/mail/claws-mail-plugins/Makefile
index c4e4cc98be8e..c962fee3037d 100644
--- a/mail/claws-mail-plugins/Makefile
+++ b/mail/claws-mail-plugins/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	claws-mail-plugins
-PORTVERSION=	3.19.0
 CATEGORIES=	mail news
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	claws-mail plugins meta-port
 WWW=		https://www.claws-mail.org/plugins.php
 
 USES=		metaport
 
-.include "../claws-mail/Makefile.claws.plugins"
+.include "${.CURDIR}/../claws-mail/Makefile.ver"
+.include "${.CURDIR}/../claws-mail/Makefile.claws.plugins"
 
 # pgpcore, pgpinline, pgpmime, smime
 CLAWS_PLUGINS+=	pgp
 
 .for _addon in ${CLAWS_PLUGINS:O}
 . if exists(../claws-mail-${_addon})
 OPTIONS_DEFINE+=	${_addon:tu}
 ${_addon:tu}_DESC!=	${MAKE} -C ../claws-mail-${_addon} -V COMMENT
 . endif
 .endfor
 
 .include <bsd.port.options.mk>
 
 .for _addon in ${CLAWS_PLUGINS}
 . if ${PORT_OPTIONS:M${_addon:tu}} != ""
 RUN_DEPENDS+=	claws-mail-${_addon}>=0:mail/claws-mail-${_addon}
 . endif
 .endfor
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws
index 2d5520300f3e..dc05c10dedf5 100644
--- a/mail/claws-mail/Makefile.claws
+++ b/mail/claws-mail/Makefile.claws
@@ -1,53 +1,53 @@
-PORTVERSION=	3.19.0
 CATEGORIES?=	mail
 MASTER_SITES=	http://www.claws-mail.org/download.php?file=releases/
 
 MAINTAINER=	portmaster@bsdforge.com
 
 LICENSE=	GPLv3
 
 USES+=		autoreconf gettext-tools gmake iconv libtool pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} --disable-dbus --disable-static
 
-.include "../claws-mail/Makefile.claws.plugins"
+.include "${.CURDIR}/../claws-mail/Makefile.ver"
+.include "${.CURDIR}/../claws-mail/Makefile.claws.plugins"
 
 .for p in ${CLAWS_PLUGINS}
 CONFIGURE_ARGS+=	--disable-${p}-plugin
 .endfor
 
 .if defined(CLAWS_PLUGINS_BUILD)
 DISTNAME=	claws-mail-${PORTVERSION}
 PKGNAMEPREFIX=	claws-mail-
 
 BUILD_DEPENDS+=	claws-mail>=${PORTVERSION}:mail/claws-mail
 RUN_DEPENDS+=	claws-mail>=${PORTVERSION}:mail/claws-mail
 
-MASTERDIR=	${.CURDIR}/../../mail/claws-mail
+MASTERDIR=	${.CURDIR}/../claws-mail
 DESCR=		${.CURDIR}/pkg-descr
 FILESDIR=	${.CURDIR}/files
 PLIST=		${NONEXISTENT}
 PKGMESSAGE=	${.CURDIR}/pkg-message
 
 CONFIGURE_ARGS+=	--disable-nls
 
 .  for p in ${CLAWS_PLUGINS_BUILD}
 CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S|--disable-${p}-plugin||}
 PLIST_FILES+=	lib/claws-mail/plugins/${p:S|spam_|spam|}.so
 .  endfor
 
 do-build:
 .  for p in ${CLAWS_PLUGINS_BUILD}
 	(cd ${WRKSRC}/src/plugins/${p} && ${MAKE_CMD})
 .  endfor
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/claws-mail/plugins
 .  for p in ${CLAWS_PLUGINS_BUILD}
 	(cd ${WRKSRC}/src/plugins/${p} && \
 		${INSTALL_LIB} .libs/${p:S|spam_|spam|}.so \
 		${STAGEDIR}${PREFIX}/lib/claws-mail/plugins)
 .  endfor
 
 .endif
diff --git a/mail/claws-mail/Makefile.ver b/mail/claws-mail/Makefile.ver
new file mode 100644
index 000000000000..251cf99d6626
--- /dev/null
+++ b/mail/claws-mail/Makefile.ver
@@ -0,0 +1 @@
+PORTVERSION=	3.19.0