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
@@ -9,8 +9,8 @@ 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
diff --git a/comms/opencbm/Makefile b/comms/opencbm/Makefile
index 60a41c46b2fe..d01d86da4815 100644
--- a/comms/opencbm/Makefile
+++ b/comms/opencbm/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	opencbm
 PORTVERSION=	${OCBM_VERSION}
-PORTREVISION=	1
 CATEGORIES=	comms archivers
 
 MAINTAINER=	zirias@FreeBSD.org
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,4 +1,5 @@
 OCBM_VERSION=	0.4.99.104
+OCBM_REVISION=	1
 DISTVERSIONPREFIX=	v
 DISTINFO_FILE=	${.CURDIR}/../opencbm/distinfo
 
@@ -17,3 +18,11 @@ 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