diff --git a/comms/opencbm-plugin-xa1541/Makefile b/comms/opencbm-plugin-xa1541/Makefile
index 3d9e312c77af..fddd313b1467 100644
--- a/comms/opencbm-plugin-xa1541/Makefile
+++ b/comms/opencbm-plugin-xa1541/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	opencbm-plugin-xa1541
 PORTVERSION=	${OCBM_VERSION}
 CATEGORIES=	comms archivers
 
 MAINTAINER=	zirias@FreeBSD.org
 COMMENT=	OpenCBM plugin for parallel-port cables
 WWW=		http://opencbm.sourceforge.net/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	cc65:devel/cc65
-RUN_DEPENDS=	opencbm=${PORTVERSION}:comms/opencbm \
-		opencbm-kmod=${PORTVERSION}:comms/opencbm-kmod
+RUN_DEPENDS=	opencbm=${PKGVERSION}:comms/opencbm \
+		opencbm-kmod>0:comms/opencbm-kmod
 
 USES=		gmake pkgconfig
 USE_LDCONFIG=	yes
 
 ALL_TARGET=	plugin-xa1541
 INSTALL_TARGET=	install-plugin-xa1541
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PLUGINBASENAME}xa1541.so.${OCBM_VERSION}
 	@${RM} ${STAGEDIR}${PREFIX}/etc/opencbm.conf.d/00opencbm.conf
 	@${RM} ${STAGEDIR}${PREFIX}/etc/opencbm.conf
 
 .include "../opencbm/Makefile.inc"
 
 .include <bsd.port.mk>
diff --git a/comms/opencbm/Makefile b/comms/opencbm/Makefile
index 60a41c46b2fe..d01d86da4815 100644
--- a/comms/opencbm/Makefile
+++ b/comms/opencbm/Makefile
@@ -1,68 +1,67 @@
 PORTNAME=	opencbm
 PORTVERSION=	${OCBM_VERSION}
-PORTREVISION=	1
 CATEGORIES=	comms archivers
 
 MAINTAINER=	zirias@FreeBSD.org
 COMMENT=	Commodore CBM serial IEC/IEEE-488 bus utilities
 WWW=		http://opencbm.sourceforge.net/
 
 LICENSE=	GPLv2 BSD3CLAUSE
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	cc65:devel/cc65
 
 USES=		gmake pkgconfig
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		DOCS INFO
 OPTIONS_DEFAULT=	DOCS INFO
 
 ALL_TARGET=	opencbm plugin-xu1541 plugin-xum1541
 INSTALL_TARGET=	install install-plugin-xu1541 install-plugin-xum1541
 
 DOCS_BUILD_DEPENDS=	dvips:print/tex-dvipsk \
 			latex:print/tex-formats \
 			linuxdoc:textproc/linuxdoc-tools
 DOCS_USES=		ghostscript:build
 DOCS_ALL_TARGET=	doc
 DOCS_MAKE_ARGS_OFF=	TXT= DVI= PDF= HTML=
 
 INFO_BUILD_DEPENDS=	linuxdoc:textproc/linuxdoc-tools
 INFO_USES=		makeinfo
 INFO_ALL_TARGET=	doc
 INFO_INFO=		opencbm
 INFO_MAKE_ARGS_OFF=	INFO=
 
 OCBM_CONFDIR=	${LOCALBASE}/etc/opencbm.conf.d
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|_ETC="$$1"|_ETC="$${1:-${LOCALBASE}/etc}"|' \
 		-e 's|in /.*/ instead|in ${OCBM_CONFDIR}/ instead|' \
 		-e "s|execute 'opencbm_|execute '|" \
 		${WRKSRC}/opencbm/LINUX/plugin_helper_tools
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopencbm.so.${OCBM_VERSION}
 .for p in xu1541 xum1541
 	${STRIP_CMD} ${STAGEDIR}${PLUGINBASENAME}${p}.so.${OCBM_VERSION}
 .endfor
 	@${RM} ${STAGEDIR}${PREFIX}/etc/opencbm.conf
 	@${MV} ${STAGEDIR}${PREFIX}/etc/opencbm.conf.d/00opencbm.conf \
 		${STAGEDIR}${PREFIX}/etc/opencbm.conf.d/00opencbm.conf.sample
 	@${MV} ${STAGEDIR}${PREFIX}/bin/opencbm_plugin_helper_tools \
 		${STAGEDIR}${PREFIX}/sbin/opencbm_plugin_helper_tools
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/opencbm/docs && \
 		${COPYTREE_SHARE} "html misc opencbm.pdf opencbm.txt" \
 		${STAGEDIR}${DOCSDIR})
 
 post-install-INFO-on:
 	${INSTALL_MAN} ${WRKSRC}/opencbm/docs/opencbm.info \
 		${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 .include "Makefile.inc"
 
 .include <bsd.port.mk>
diff --git a/comms/opencbm/Makefile.inc b/comms/opencbm/Makefile.inc
index 14ead178951d..a4d863c37667 100644
--- a/comms/opencbm/Makefile.inc
+++ b/comms/opencbm/Makefile.inc
@@ -1,19 +1,28 @@
 OCBM_VERSION=	0.4.99.104
+OCBM_REVISION=	1
 DISTVERSIONPREFIX=	v
 DISTINFO_FILE=	${.CURDIR}/../opencbm/distinfo
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenCBM
 GH_PROJECT=	OpenCBM
 
 MAKEFILE?=	LINUX/Makefile
 MAKE_ARGS=	CC="${CC}" \
 		INFODIR=${PREFIX}/${INFO_PATH} \
 		SUBDIRS_PLUGIN_XA1541=opencbm/lib/plugin/xa1541
 MAKE_ENV=	USER_CFLAGS="${CFLAGS}"
 
 PLIST_SUB=	OCBM_VERSION=${OCBM_VERSION}
 
 PORTSCOUT=	limit:^v\d
 
 PLUGINBASENAME=	${PREFIX}/lib/opencbm/plugin/libopencbm-
+
+.if ${PORTNAME:Nopencbm-kmod}
+.  if defined(PORTREVISION)
+IGNORE=		PORTREVISION must not be defined explicitly
+.  else
+PORTREVISION=	${OCBM_REVISION}
+.  endif
+.endif