diff --git a/vagrant.changes b/vagrant.changes
index 45e13fa..b8650f4 100644
--- a/vagrant.changes
+++ b/vagrant.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Oct 14 08:32:24 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Use unconditional load: the %{?load…} construct does not work
+  with RPM 4.17, and not being able to load would give completely
+  different result anyway.
+- Fix the construct to block invalid ruby versions. The syntax
+  %{ruby:3 < 3.1} 'worked', but essentially just translated to
+  %{ruby} in older RPM versions.
+
 -------------------------------------------------------------------
 Tue Aug  3 08:58:34 UTC 2021 - Dan Čermák <dcermak@suse.com>
 
diff --git a/vagrant.spec b/vagrant.spec
index ba86ef9..84569d1 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -75,7 +75,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 # we use the rpm macros in this spec
 # need to load them *after* defining the rb_* macros
-%{?load:%{SOURCE97}}
+%{load:%{SOURCE97}}
 
 %global vagrant_plugin_name vagrant
 
@@ -86,9 +86,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 #  s.required_ruby_version     = ">= 2.5", "< 3.1"
 %if 0%{?suse_version} > 1500
-BuildRequires:  %{ruby:3 < 3.1}
+BuildRequires:  %{ruby} < 3.1
 %else
-BuildRequires:  %{ruby:2 >= 2.5}
+BuildRequires:  %{ruby} >= 2.5
 %endif
 #
 #