diff --git a/msitools.spec b/msitools.spec
index e7652fd..4de5e71 100644
--- a/msitools.spec
+++ b/msitools.spec
@@ -1,8 +1,18 @@
 #define _version_suffix
 
+# The mingw* RPMs are noarch, and the wxi data files are
+# arch independant, so it is a waste of CPU cycles to run
+# validation on all arches. Just run on x86_64 since that
+# has the fastest Fedora builders.
+%ifarch x86_64
+%define with_validate 1
+%else
+%define with_validate 0
+%endif
+
 Name:           msitools
 Version:        0.99
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Windows Installer tools
 
 License:        GPLv2+
@@ -20,6 +30,173 @@ BuildRequires:  libuuid-devel
 BuildRequires:  vala
 BuildRequires:  bison
 
+%if %{with_validate}
+BuildRequires:  perl
+BuildRequires:  perl-XML-XPath
+BuildRequires:  mingw32-adwaita-icon-theme
+BuildRequires:  mingw64-adwaita-icon-theme
+BuildRequires:  mingw32-atk
+BuildRequires:  mingw64-atk
+BuildRequires:  mingw32-bzip2
+BuildRequires:  mingw64-bzip2
+BuildRequires:  mingw32-cairo
+BuildRequires:  mingw64-cairo
+BuildRequires:  mingw32-celt051
+BuildRequires:  mingw64-celt051
+BuildRequires:  mingw32-curl
+BuildRequires:  mingw64-curl
+BuildRequires:  mingw32-dlfcn
+BuildRequires:  mingw64-dlfcn
+BuildRequires:  mingw32-expat
+BuildRequires:  mingw64-expat
+BuildRequires:  mingw32-fontconfig
+BuildRequires:  mingw64-fontconfig
+BuildRequires:  mingw32-freetype
+BuildRequires:  mingw64-freetype
+BuildRequires:  mingw32-gcc-c++
+BuildRequires:  mingw64-gcc-c++
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw32-gdk-pixbuf
+BuildRequires:  mingw64-gdk-pixbuf
+BuildRequires:  mingw32-gettext
+BuildRequires:  mingw64-gettext
+BuildRequires:  mingw32-glib2
+BuildRequires:  mingw64-glib2
+BuildRequires:  mingw32-glib-networking
+BuildRequires:  mingw64-glib-networking
+BuildRequires:  mingw32-gmp
+BuildRequires:  mingw64-gmp
+BuildRequires:  mingw32-gnutls
+BuildRequires:  mingw64-gnutls
+BuildRequires:  mingw32-gsm
+BuildRequires:  mingw64-gsm
+BuildRequires:  mingw32-gstreamer1-plugins-bad-free
+BuildRequires:  mingw64-gstreamer1-plugins-bad-free
+BuildRequires:  mingw32-gstreamer1-plugins-base
+BuildRequires:  mingw64-gstreamer1-plugins-base
+BuildRequires:  mingw32-gstreamer1-plugins-good
+BuildRequires:  mingw64-gstreamer1-plugins-good
+BuildRequires:  mingw32-gstreamer1
+BuildRequires:  mingw64-gstreamer1
+BuildRequires:  mingw32-gstreamer-plugins-bad-free
+BuildRequires:  mingw64-gstreamer-plugins-bad-free
+BuildRequires:  mingw32-gstreamer-plugins-base
+BuildRequires:  mingw64-gstreamer-plugins-base
+BuildRequires:  mingw32-gstreamer-plugins-good
+BuildRequires:  mingw64-gstreamer-plugins-good
+BuildRequires:  mingw32-gstreamer
+BuildRequires:  mingw64-gstreamer
+BuildRequires:  mingw32-gtk2
+BuildRequires:  mingw64-gtk2
+BuildRequires:  mingw32-gtk3
+BuildRequires:  mingw64-gtk3
+BuildRequires:  mingw32-gtk-vnc2
+BuildRequires:  mingw64-gtk-vnc2
+BuildRequires:  mingw32-gtk-vnc
+BuildRequires:  mingw64-gtk-vnc
+BuildRequires:  mingw32-gvnc
+BuildRequires:  mingw64-gvnc
+BuildRequires:  mingw32-harfbuzz
+BuildRequires:  mingw64-harfbuzz
+BuildRequires:  mingw32-hicolor-icon-theme
+BuildRequires:  mingw64-hicolor-icon-theme
+BuildRequires:  mingw32-icu
+BuildRequires:  mingw64-icu
+BuildRequires:  mingw32-ilmbase
+BuildRequires:  mingw64-ilmbase
+BuildRequires:  mingw32-jasper
+BuildRequires:  mingw64-jasper
+BuildRequires:  mingw32-json-glib
+BuildRequires:  mingw64-json-glib
+BuildRequires:  mingw32-libepoxy
+BuildRequires:  mingw64-libepoxy
+BuildRequires:  mingw32-libffi
+BuildRequires:  mingw64-libffi
+BuildRequires:  mingw32-libgcrypt
+BuildRequires:  mingw64-libgcrypt
+BuildRequires:  mingw32-libgovirt
+BuildRequires:  mingw64-libgovirt
+BuildRequires:  mingw32-libgpg-error
+BuildRequires:  mingw64-libgpg-error
+BuildRequires:  mingw32-libidn2
+BuildRequires:  mingw64-libidn2
+BuildRequires:  mingw32-libjpeg-turbo
+BuildRequires:  mingw64-libjpeg-turbo
+BuildRequires:  mingw32-libogg
+BuildRequires:  mingw64-libogg
+BuildRequires:  mingw32-libpng
+BuildRequires:  mingw64-libpng
+BuildRequires:  mingw32-libsoup
+BuildRequires:  mingw64-libsoup
+BuildRequires:  mingw32-libssh2
+BuildRequires:  mingw64-libssh2
+BuildRequires:  mingw32-libtasn1
+BuildRequires:  mingw64-libtasn1
+BuildRequires:  mingw32-libtheora
+BuildRequires:  mingw64-libtheora
+BuildRequires:  mingw32-libtiff
+BuildRequires:  mingw64-libtiff
+BuildRequires:  mingw32-libusbx
+BuildRequires:  mingw64-libusbx
+BuildRequires:  mingw32-libvirt-glib
+BuildRequires:  mingw64-libvirt-glib
+BuildRequires:  mingw32-libvirt
+BuildRequires:  mingw64-libvirt
+BuildRequires:  mingw32-libvorbis
+BuildRequires:  mingw64-libvorbis
+BuildRequires:  mingw32-libxml2
+BuildRequires:  mingw64-libxml2
+BuildRequires:  mingw32-nettle
+BuildRequires:  mingw64-nettle
+BuildRequires:  mingw32-nspr
+BuildRequires:  mingw64-nspr
+BuildRequires:  mingw32-OpenEXR
+BuildRequires:  mingw64-OpenEXR
+BuildRequires:  mingw32-openssl
+BuildRequires:  mingw64-openssl
+BuildRequires:  mingw32-opus
+BuildRequires:  mingw64-opus
+BuildRequires:  mingw32-orc
+BuildRequires:  mingw64-orc
+BuildRequires:  mingw32-p11-kit
+BuildRequires:  mingw64-p11-kit
+BuildRequires:  mingw32-pango
+BuildRequires:  mingw64-pango
+BuildRequires:  mingw32-pcre
+BuildRequires:  mingw64-pcre
+BuildRequires:  mingw32-pixman
+BuildRequires:  mingw64-pixman
+BuildRequires:  mingw32-portablexdr
+BuildRequires:  mingw64-portablexdr
+BuildRequires:  mingw32-readline
+BuildRequires:  mingw64-readline
+BuildRequires:  mingw32-rest
+BuildRequires:  mingw64-rest
+BuildRequires:  mingw32-SDL
+BuildRequires:  mingw64-SDL
+BuildRequires:  mingw32-speex
+BuildRequires:  mingw64-speex
+BuildRequires:  mingw32-spice-glib
+BuildRequires:  mingw64-spice-glib
+BuildRequires:  mingw32-spice-gtk3
+BuildRequires:  mingw64-spice-gtk3
+BuildRequires:  mingw32-sqlite
+BuildRequires:  mingw64-sqlite
+BuildRequires:  mingw32-termcap
+BuildRequires:  mingw64-termcap
+BuildRequires:  mingw32-usbredir
+BuildRequires:  mingw64-usbredir
+BuildRequires:  mingw32-wavpack
+BuildRequires:  mingw64-wavpack
+BuildRequires:  mingw32-win-iconv
+BuildRequires:  mingw64-win-iconv
+BuildRequires:  mingw32-winpthreads
+BuildRequires:  mingw64-winpthreads
+BuildRequires:  mingw32-zlib
+BuildRequires:  mingw64-zlib
+%endif
+
 %description
 msitools is a collection of utilities to inspect and create Windows
 Installer files.  It is useful in a cross-compilation environment such
@@ -57,6 +234,11 @@ rm -f %{buildroot}%{_libdir}/*.la
 
 %find_lang %{name}
 
+%if %{with_validate}
+%check
+make -C data check-wxi
+%endif
+
 %ldconfig_scriptlets -n libmsi1
 
 %files
@@ -85,6 +267,9 @@ rm -f %{buildroot}%{_libdir}/*.la
 
 
 %changelog
+* Tue Feb 19 2019 Daniel P. Berrangé <berrange@redhat.com> - 0.99-2
+- Validate wxi files during build
+
 * Fri Feb 15 2019 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.99-1
 - new version