diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes
index c66cdc0..b0cf029 100644
--- a/MozillaThunderbird.changes
+++ b/MozillaThunderbird.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Dec  8 15:53:30 UTC 2017 - dimstar@opensuse.org
+
+- Explicitly buildrequires python2-xml: The build system relies on
+  it. We wrongly relied on other packages pulling it in for us.
+
+-------------------------------------------------------------------
+Thu Dec  7 11:13:41 UTC 2017 - dimstar@opensuse.org
+
+- Escape the usage of %{VERSION} when calling out to rpm.
+  RPM 4.14 has %{VERSION} defined as 'the main packages version'.
+
 -------------------------------------------------------------------
 Wed Nov 22 10:02:35 UTC 2017 - wr@rosenauer.org
 
diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec
index a03309b..b4b0aba 100644
--- a/MozillaThunderbird.spec
+++ b/MozillaThunderbird.spec
@@ -44,6 +44,7 @@ BuildRequires:  libnotify-devel
 BuildRequires:  mozilla-nspr-devel >= 4.13.1
 BuildRequires:  mozilla-nss-devel >= 3.28.6
 BuildRequires:  python
+BuildRequires:  python2-xml
 BuildRequires:  startup-notification-devel
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
@@ -128,8 +129,8 @@ Recommends:     libpulse0
 %define __find_requires sh %{SOURCE7}
 %global provfind sh -c "grep -v '.so' | %__find_provides"
 %global __find_provides %provfind
-Requires:       mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
-Requires:       mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss)
+Requires:       mozilla-nspr >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr)
+Requires:       mozilla-nss >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nss)
 Conflicts:      thunderbird-esr
 %define progname thunderbird
 %define progdir %{_prefix}/%_lib/thunderbird
@@ -171,8 +172,8 @@ of MozillaThunderbird.
 %package devel
 Summary:        Mozilla Thunderbird SDK
 Group:          Development/Libraries/Other
-Requires:       mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel)
-PreReq:         mozilla-nss-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss-devel)
+Requires:       mozilla-nspr-devel >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr-devel)
+PreReq:         mozilla-nss-devel >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nss-devel)
 PreReq:         %{name} = %{mainversion}
 
 %description devel