$ git diff --patch-with-stat --summary 7d87923e0ddc119552e4b7f900aa9ebf2de904dc..dda7df64cdb502e57b105e68c8e9b7fb6995ef8e

 .abf.yml          |   2 +-
 libxkbcommon.spec | 140 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 135 insertions(+), 7 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 90c4231..26e4c6f 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  libxkbcommon-0.10.0.tar.xz: d8f956f4bc5382d5d8e0e4dd590c4f090e0e985a
+  libxkbcommon-1.0.1.tar.xz: c3eb29be002785f51f74614bbd61fd64fce7812d 
diff --git a/libxkbcommon.spec b/libxkbcommon.spec
index 1608eb9..f0b5c37 100644
--- a/libxkbcommon.spec
+++ b/libxkbcommon.spec
@@ -1,14 +1,25 @@
+# libxkbcommon is used by sdl2, used by wine and many games
+%ifarch %{x86_64}
+%bcond_without compat32
+%endif
+
 %define bname xkbcommon
 %define major 0
 %define libname %mklibname %{bname} %{major}
 %define libnamex11 %mklibname %{bname}-x11 %{major}
 %define libname_devel %mklibname %{bname} -d
 %define libnamex11_devel %mklibname %{bname}-x11 -d
+%define libnamereg %mklibname xkbregistry %{major}
+%define libnamereg_devel %mklibname xkbregistry -d
+%define lib32name %mklib32name %{bname} %{major}
+%define lib32namex11 %mklib32name %{bname}-x11 %{major}
+%define lib32name_devel %mklib32name %{bname} -d
+%define lib32namex11_devel %mklib32name %{bname}-x11 -d
 
 Summary:	XKB API common to servers and clients
 Name:		libxkbcommon
-Version:	0.10.0
-Release:	1
+Version:	1.0.1
+Release:	2
 License:	MIT
 Group:		System/Libraries
 Url:		http://xkbcommon.org/
@@ -25,6 +36,16 @@ BuildRequires:	pkgconfig(wayland-scanner)
 BuildRequires:	pkgconfig(wayland-protocols)
 # to auto-detect XKB config root
 BuildRequires:	x11-data-xkbdata
+BuildRequires:	pkgconfig(libxml-2.0)
+%if %{with compat32}
+BuildRequires:	devel(libxcb-xkb)
+BuildRequires:	devel(libX11-xcb)
+BuildRequires:	devel(libX11)
+BuildRequires:	devel(libxcb)
+BuildRequires:	devel(libXau)
+BuildRequires:	devel(libXdmcp)
+BuildRequires:	devel(libxml2)
+%endif
 
 %description
 The %{name} package provides XKB API common to servers and clients.
@@ -32,6 +53,7 @@ The %{name} package provides XKB API common to servers and clients.
 %package -n %{libname}
 Summary:	Libraries for %{name}
 Group:		System/Libraries
+Requires:	xkeyboard-config
 
 %description -n %{libname}
 This package contains the libraries for %{name}.
@@ -46,11 +68,18 @@ Obsoletes:	%{_lib}xkbcommon-x110 < 0.4.2-4
 %description -n %{libnamex11}
 This package contains the libraries for X11 bits of %{name}.
 
+%package -n %{libnamereg}
+Summary:	Libraries for xkbregistry bits of %{name}
+Group:		System/Libraries
+
+%description -n %{libnamereg}
+This package contains the libraries for xkbregistry bits of %{name}.
+
 %package -n %{libname_devel}
 Summary:	Header files for %{name}
 Group:		Development/C
-Provides:	%{name}-devel = %{version}-%{release}
-Requires:	%{libname} = %{version}-%{release}
+Provides:	%{name}-devel = %{EVRD}
+Requires:	%{libname} = %{EVRD}
 
 %description -n %{libname_devel}
 This package contains the header and pkg-config files for developing
@@ -66,6 +95,16 @@ Requires:	%{libname_devel} = %{version}-%{release}
 This package contains the header and pkg-config files for developing
 with X11 bits of %{name}.
 
+%package -n %{libnamereg_devel}
+Summary:	Header files for xkbregistry bits of %{name}
+Group:		Development/C
+Requires:	%{libnamereg} = %{version}-%{release}
+Requires:	%{libname_devel} = %{version}-%{release}
+
+%description -n %{libnamereg_devel}
+This package contains the header and pkg-config files for developing
+with xkbregistry bits of %{name}.
+
 %package doc
 Summary:	%{name} documentation
 Group:		Development/Other
@@ -73,15 +112,72 @@ Group:		Development/Other
 %description doc
 This package contains documentation of %{name}.
 
+%package utils
+Summary:	X.Org X11 XKB parsing utilities
+Requires:	%{libname}
+
+%description utils
+%{name}-utils is a set of utilities to analyze and test XKB parsing.
+
+%if %{with compat32}
+%package -n %{lib32name}
+Summary:	Libraries for %{name} (32-bit)
+Group:		System/Libraries
+Requires:	xkeyboard-config
+
+%description -n %{lib32name}
+This package contains the libraries for %{name}.
+
+%package -n %{lib32namex11}
+Summary:	Libraries for X11 bits of %{name} (32-bit)
+Group:		System/Libraries
+
+%description -n %{lib32namex11}
+This package contains the libraries for X11 bits of %{name}.
+
+%package -n %{lib32name_devel}
+Summary:	Header files for %{name} (32-bit)
+Group:		Development/C
+Requires:	%{libname_devel} = %{version}-%{release}
+Requires:	%{lib32name} = %{version}-%{release}
+
+%description -n %{lib32name_devel}
+This package contains the header and pkg-config files for developing
+with %{name}.
+
+%package -n %{lib32namex11_devel}
+Summary:	Header files for X11 bits of %{name} (32-bit)
+Group:		Development/C
+Requires:	%{libnamex11_devel} = %{version}-%{release}
+Requires:	%{lib32namex11} = %{version}-%{release}
+Requires:	%{lib32name_devel} = %{version}-%{release}
+
+%description -n %{lib32namex11_devel}
+This package contains the header and pkg-config files for developing
+with X11 bits of %{name}.
+%endif
+
 %prep
 %autosetup -p1
-
-%build
+%if %{with compat32}
+# FIXME at some point, we'll probably want to enable wayland.
+# For now, wine and steam games don't do wayland anyway.
+%meson32 \
+	-Denable-wayland=false \
+	-Denable-xkbregistry=false
+%endif
 %meson
 
+%build
+%if %{with compat32}
+%ninja_build -C build32
+%endif
 %meson_build
 
 %install
+%if %{with compat32}
+%ninja_install -C build32
+%endif
 %meson_install
 
 %files -n %{libname}
@@ -92,6 +188,10 @@ This package contains documentation of %{name}.
 %{_libdir}/%{name}-x11.so.%{major}
 %{_libdir}/%{name}-x11.so.%{major}.*
 
+%files -n %{libnamereg}
+%{_libdir}/libxkbregistry.so.%{major}
+%{_libdir}/libxkbregistry.so.%{major}.*
+
 %files -n %{libname_devel}
 %{_includedir}/%{bname}/%{bname}.h
 %{_includedir}/%{bname}/%{bname}-compat.h
@@ -106,5 +206,33 @@ This package contains documentation of %{name}.
 %{_libdir}/%{name}-x11.so
 %{_libdir}/pkgconfig/%{bname}-x11.pc
 
+%files -n %{libnamereg_devel}
+%{_includedir}/xkbcommon/xkbregistry.h
+%{_libdir}/libxkbregistry.so
+%{_libdir}/pkgconfig/xkbregistry.pc
+
+%files utils
+%{_bindir}/xkbcli
+%{_libexecdir}/xkbcommon/xkbcli-*
+%{_mandir}/man1/xkbcli*.1.*
+
 %files doc
 %doc %{_docdir}/%{name}/*
+
+%if %{with compat32}
+%files -n %{lib32name}
+%{_prefix}/lib/%{name}.so.%{major}
+%{_prefix}/lib/%{name}.so.%{major}.*
+
+%files -n %{lib32namex11}
+%{_prefix}/lib/%{name}-x11.so.%{major}
+%{_prefix}/lib/%{name}-x11.so.%{major}.*
+
+%files -n %{lib32name_devel}
+%{_prefix}/lib/%{name}.so
+%{_prefix}/lib/pkgconfig/%{bname}.pc
+
+%files -n %{lib32namex11_devel}
+%{_prefix}/lib/%{name}-x11.so
+%{_prefix}/lib/pkgconfig/%{bname}-x11.pc
+%endif