diff --git a/make/pkg-dist.mk b/make/pkg-dist.mk
index 879bfc54..ab3ca837 100644
--- a/make/pkg-dist.mk
+++ b/make/pkg-dist.mk
@@ -78,13 +78,13 @@ ifeq ($(CREATE_DEVEL),true)
 BINARY_PKG                  += $(DIST_PCKG_DIR)/$(PKG_DEVEL_X86)
 endif
 
-PKG_REQUIRES_BUILD          += $(call proj_query, pkg-requires  $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS)  build $(PROJECT))
-PKG_REQUIRES_RUN            += $(call proj_query, pkg-requires  $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS)  run   $(PROJECT))
-PKG_REQUIRES_DEVEL          += $(call proj_query, pkg-requires  $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS)  devel $(PROJECT))
-PKG_CONFLICTS_RUN           += $(call proj_query, pkg-conflicts $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) run   $(PROJECT))
-PKG_CONFLICTS_DEVEL         += $(call proj_query, pkg-conflicts $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) devel $(PROJECT))
-PKG_PROVIDES_RUN            += $(call proj_query, pkg-provides  $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS)  run   $(PROJECT))
-PKG_PROVIDES_DEVEL          += $(call proj_query, pkg-provides  $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS)  devel $(PROJECT))
+PKG_REQUIRES_BUILD          += $(call proj_query, pkg-requires  --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS)  build $(PROJECT))
+PKG_REQUIRES_RUN            += $(call proj_query, pkg-requires  --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS)  run   $(PROJECT))
+PKG_REQUIRES_DEVEL          += $(call proj_query, pkg-requires  --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS)  devel $(PROJECT))
+PKG_CONFLICTS_RUN           += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) run   $(PROJECT))
+PKG_CONFLICTS_DEVEL         += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) devel $(PROJECT))
+PKG_PROVIDES_RUN            += $(call proj_query, pkg-provides  --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS)  run   $(PROJECT))
+PKG_PROVIDES_DEVEL          += $(call proj_query, pkg-provides  --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS)  devel $(PROJECT))
 
 PKG_UPLOAD_OS_NAME           = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//')
 PKG_UPLOAD_OS_VERSION        = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//')
diff --git a/scripts/pkg.sh b/scripts/pkg.sh
index 39adaf3b..9e24c9ae 100644
--- a/scripts/pkg.sh
+++ b/scripts/pkg.sh
@@ -438,12 +438,16 @@ build_pkg()
 	local tar_archive_orig=$src_base.orig.tar.bz2
 	local distribution=`get_os`
 
-	local rpm_requires_run="$PKG_REQUIRES_RUN"
-	local rpm_requires_devel="$PKG_REQUIRES_DEVEL"
-	local rpm_conflicts_run="$PKG_CONFLICTS_RUN"
-	local rpm_conflicts_devel="$PKG_CONFLICTS_DEVEL"
-	local rpm_provides_run="$PKG_PROVIDES_RUN"
-	local rpm_provides_devel="$PKG_PROVIDES_DEVEL"
+	expand_version_macros() {
+		echo "$@" | sed "s/__NEXT_VERSION__/$version/g; s/VERSION-REVISION/$version/g; s/VERSION/$version/g"
+	}
+
+	local rpm_requires_run=`expand_version_macros $PKG_REQUIRES_RUN`
+	local rpm_requires_devel=`expand_version_macros $PKG_REQUIRES_DEVEL`
+	local rpm_conflicts_run=`expand_version_macros $PKG_CONFLICTS_RUN`
+	local rpm_conflicts_devel=`expand_version_macros $PKG_CONFLICTS_DEVEL`
+	local rpm_provides_run=`expand_version_macros $PKG_PROVIDES_RUN`
+	local rpm_provides_devel=`expand_version_macros $PKG_PROVIDES_DEVEL`
 
 	# --- create source directory tree
 	create_empty_dir $src_tree "Source files compilation directory"
diff --git a/src/python/jw/pkg/lib/version/base.py b/src/python/jw/pkg/lib/version/base.py
index 4d9a12f0..6088bbef 100644
--- a/src/python/jw/pkg/lib/version/base.py
+++ b/src/python/jw/pkg/lib/version/base.py
@@ -29,8 +29,8 @@ class Boundary(NamedTuple):  # export
 
     op: str
     version: Version
-    """Syntax-aware formatted version comparion operator"""
 
+    """Syntax-aware formatted version comparion operator"""
     def format_op(self, syntax: Syntax) -> str:
         if syntax is Syntax.DEBIAN:
             match self.op: