diff --git a/avahi.spec b/avahi.spec
index 3ce38e9..429d881 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.21
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -50,12 +50,21 @@ shared. This kind of technology is already found in MacOS X (branded
 convenient.
 
 %package tools
-Summary: Tools for mDNS browsing and publishing
+Summary: Command line tools for mDNS browsing and publishing
 Group: System Environment/Base
 Requires: %{name} = %{version}, gtk2, pygtk2, pygtk2-libglade, gdbm, python, dbus-python
 
 %description tools
-Tools that use avahi to browse and publish mDNS services and hosts.
+Command line tools that use avahi to browse and publish mDNS services.
+
+%package ui-tools
+Summary: UI tools for mDNS browsing
+Group: System Environment/Base
+Requires: %{name} = %{version}
+Requires: %{name}-ui = %{version}
+
+%description ui-tools
+Graphical user interface tools that use Avahi to browse for mDNS services.
 
 %package glib
 Summary: Glib libraries for avahi
@@ -90,6 +99,7 @@ Summary: Libraries and header files for Avahi UI development
 Group: Development/Libraries
 Requires: %{name}-devel = %{version}
 Requires: %{name}-ui = %{version}
+Requires: %{name}-glib-devel = %{version}
 
 %description ui-devel
 The avahi-ui-devel package contains the header files and libraries
@@ -234,7 +244,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 # remove example 
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/avahi/services/ssh.service
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/avahi/services/sftp-ssh.service
 
 # remove desktop file for avahi-discover
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/avahi-discover.desktop
@@ -340,7 +350,7 @@ fi
 
 %files
 %defattr(0644,root,root,0755)
-%doc docs/* avahi-daemon/example.service avahi-daemon/ssh.service
+%doc docs/* avahi-daemon/example.service avahi-daemon/sftp-ssh.service
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/avahi-daemon
 %dir %{_sysconfdir}/avahi
 %dir %{_sysconfdir}/avahi/etc
@@ -349,7 +359,7 @@ fi
 %dir %{_sysconfdir}/avahi/services
 %attr(0755,avahi,avahi) %dir %{_localstatedir}/run/avahi-daemon
 %config(noreplace) %{_sysconfdir}/avahi/avahi-daemon.conf
-%config(noreplace) %{_sysconfdir}/avahi/services/sftp-ssh.service
+%config(noreplace) %{_sysconfdir}/avahi/services/ssh.service
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
 %attr(0755,root,root) %{_sbindir}/avahi-daemon
 %attr(0755,root,root) %{_libdir}/libavahi-common.so.*
@@ -379,9 +389,16 @@ fi
 # These are .py files only, so they don't go in lib64
 %{_prefix}/lib/python?.?/site-packages/*
 %{_mandir}/man1/*
-%{_datadir}/applications/b*.desktop
 %{_datadir}/avahi/interfaces/
 %exclude %{_bindir}/avahi-discover-standalone
+%exclude %{_bindir}/b*
+%exclude %{_mandir}/man1/b*
+
+%files ui-tools
+%defattr(0644, root, root, 0755)
+%attr(0755,root,root) %{_bindir}/b*
+%{_mandir}/man1/b*
+%{_datadir}/applications/b*.desktop
 
 %files devel
 %defattr(0644, root, root, 0755)
@@ -466,6 +483,11 @@ fi
 %endif
 
 %changelog
+* Thu Sep 6 2007 Lennart Poettering <lpoetter@redhat.com> - 0.6.21-4
+- Ship ssh static service file by default, don't ship ssh-sftp by default
+- resolves: #269741: split off avahi-ui-tools package
+- resolves: #253734: add missing dependency on avahi-glib-devel to avahi-ui-devel
+
 * Tue Aug 28 2007 Martin Bacovsky <mbacovsk@redhat.com> - 0.6.21-3
 - resolves: #246875: Initscript Review