diff --git a/avahi.spec b/avahi.spec
index 782c3b7add01f48f5f0122a5dc4de54bfd683528..e10a83a59206e9a869385063bb7cdb01a8d13c9e 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -3,7 +3,7 @@
 
 Name:             avahi
 Version:          0.8
-Release:          20
+Release:          21
 Summary:          Avahi is a local network service discovery
 License:          LGPLv2+
 URL:              http://avahi.org
@@ -45,7 +45,6 @@ BuildRequires:    python3-devel
 %else
 Obsoletes:        python2-avahi < %{version}-%{release}
 Obsoletes:        python3-avahi < %{version}-%{release}
-Obsoletes:        avahi-ui-tools < %{version}-%{release}
 %endif
 
 Requires:         dbus expat libdaemon >= 0.11 %{name}-libs = %{version}-%{release}
@@ -74,8 +73,12 @@ Requires:         %{name} = %{version}-%{release}
 Requires:         %{name}-libs = %{version}-%{release} 
 Requires:         %{name}-glib = %{version}-%{release}
 Requires:         %{name}-ui-gtk3 = %{version}-%{release}
-Requires:         tigervnc openssh-clients pygtk2 pygtk2-libglade gdbm
+Requires:         tigervnc openssh-clients
+Conflicts:        %{name}-tools < 0.8-21
 %if %{WITH_PYTHON}
+Requires:         gdbm
+Requires:         pygtk2
+Requires:         pygtk2-libglade
 Requires:         python2-avahi = %{version}-%{release}
 Requires:         python2-dbus
 Requires:         python2-gobject-base
@@ -316,10 +319,6 @@ if [ -n "$(grep '^GenericName=$' $i)" ]; then
   desktop-file-edit --copy-name-to-generic-name $i
 fi
 done
-%else
-# unpackaged files
-rm -fv $RPM_BUILD_ROOT%{_datadir}/applications/{bssh,bvnc}.desktop
-rm -fv $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.ui
 %endif
 
 %find_lang %{name}
@@ -527,19 +526,26 @@ fi
 %config(noreplace) %{_sysconfdir}/avahi/avahi-dnsconfd.action
 
 %files tools
-%{_bindir}/*
-%if %{WITH_PYTHON}
-%exclude %{_bindir}/b*
-%exclude %{_bindir}/avahi-discover*
-%exclude %{_bindir}/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
 
 %files ui-tools
-%{_bindir}/b*
-%{_bindir}/avahi-discover
-%{_bindir}/avahi-bookmarks
+%{_bindir}/avahi-discover-standalone
+%{_bindir}/bshell
+%{_bindir}/bssh
+%{_bindir}/bvnc
 %{_datadir}/applications/b*.desktop
+%{_datadir}/avahi/interfaces
+%if %{WITH_PYTHON}
+%{_bindir}/avahi-bookmarks
 %{_datadir}/applications/avahi-discover.desktop
-%{_datadir}/avahi/interfaces/
 %{python2_sitelib}/avahi_discover/
 %endif
 
@@ -588,6 +594,9 @@ fi
 %{_mandir}/man8/*
 
 %changelog
+* Mon Oct 28 2024 zhangpan <zhangpan103@h-partners.com> - 0.8-21
+- fix bssh and avahi-discover-standalone packaging in the wrong location
+
 * Mon Jun 24 2024 zhangpan <zhangpan103@h-partners.com> - 0.8-20
 - disable avahi-daemon.service default