diff --git a/avahi.spec b/avahi.spec
index 32abd6a..32e0bad 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -32,7 +32,7 @@
 
 Name:             avahi
 Version:          0.7
-Release:          23%{?dist}
+Release:          24%{?dist}
 Summary:          Local network service discovery
 License:          LGPLv2+
 URL:              http://avahi.org
@@ -78,11 +78,12 @@ BuildRequires:    python3-devel
 %else
 Obsoletes: python2-avahi < %{version}-%{release}
 Obsoletes: python3-avahi < %{version}-%{release}
-Obsoletes: avahi-ui-tools < %{version}-%{release}
+%if %{without bootstrap}
+BuildRequires:    pygtk2
+%endif
 %endif
 BuildRequires:    gdbm-devel
 BuildRequires:    pkgconfig(pygobject-3.0)
-BuildRequires:    pygtk2
 BuildRequires:    intltool
 BuildRequires:    perl-XML-Parser
 BuildRequires:    xmltoman
@@ -132,10 +133,10 @@ Requires:         %{name}-glib%{?_isa} = %{version}-%{release}
 Requires:         %{name}-ui-gtk3%{?_isa} = %{version}-%{release}
 Requires:         tigervnc
 Requires:         openssh-clients
+%if %{WITH_PYTHON}
+Requires:         gdbm
 Requires:         pygtk2
 Requires:         pygtk2-libglade
-Requires:         gdbm
-%if %{WITH_PYTHON}
 Requires:         python2-avahi = %{version}-%{release}
 Requires:         %{python2_dbus}
 Requires:         python2-gobject-base
@@ -586,22 +587,36 @@ exit 0
 %{_unitdir}/avahi-dnsconfd.service
 
 %files tools
-%{_bindir}/*
-%{_mandir}/man1/*
-%if %{WITH_PYTHON}
-%exclude %{_bindir}/b*
-%exclude %{_bindir}/avahi-discover*
-%exclude %{_bindir}/avahi-bookmarks
-%exclude %{_mandir}/man1/b*
-%exclude %{_mandir}/man1/avahi-discover*
-%exclude %{_mandir}/man1/avahi-bookmarks*
+%{_bindir}/avahi-browse
+%{_bindir}/avahi-browse-domains
+%{_bindir}/avahi-publish
+%{_bindir}/avahi-publish-address
+%{_bindir}/avahi-publish-service
+%{_bindir}/avahi-resolve
+%{_bindir}/avahi-resolve-address
+%{_bindir}/avahi-resolve-host-name
+%{_bindir}/avahi-set-host-name
+
+%{_mandir}/man1/avahi-browse.1*
+%{_mandir}/man1/avahi-browse-domains.1*
+%{_mandir}/man1/avahi-publish.1*
+%{_mandir}/man1/avahi-publish-address.1*
+%{_mandir}/man1/avahi-publish-service.1*
+%{_mandir}/man1/avahi-resolve.1*
+%{_mandir}/man1/avahi-resolve-address.1*
+%{_mandir}/man1/avahi-resolve-host-name.1*
+%{_mandir}/man1/avahi-set-host-name.1*
 
 %files ui-tools
-%{_bindir}/b*
-%{_bindir}/avahi-discover
+%{_bindir}/bshell
+%{_bindir}/bssh
+%{_bindir}/bvnc
+%{_bindir}/avahi-discover-standalone
+%{_mandir}/man1/bssh.1*
+%{_mandir}/man1/bvnc.1*
+%if %{WITH_PYTHON}
 # avahi-bookmarks is not really a UI tool, but I won't create a seperate package for it...
 %{_bindir}/avahi-bookmarks
-%{_mandir}/man1/b*
 %{_mandir}/man1/avahi-discover*
 %{_mandir}/man1/avahi-bookmarks*
 %{_datadir}/applications/b*.desktop
@@ -730,6 +745,9 @@ exit 0
 
 
 %changelog
+* Thu Oct 15 2020 Rex Dieter <rdieter@fedoraproject.org> - 0.7-24
+- cherry-pick: resurrect ui-tools, not just for python (#1885513)
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.7-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild