diff --git a/avahi-glib2.spec b/avahi-glib2.spec
index cd36356..36b0e76 100644
--- a/avahi-glib2.spec
+++ b/avahi-glib2.spec
@@ -783,7 +783,7 @@ install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png
 install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
 install -m 644 avahi-discover-standalone/avahi-discover.ui $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
 %endif
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
 %else
 # There is no simple way to not install core files. Remove them here.
 # The rest is enabled/disabled in configure as needed.
@@ -911,6 +911,18 @@ fi
 %post -n libavahi-glib1 -p /sbin/ldconfig
 
 %postun -n libavahi-glib1 -p /sbin/ldconfig
+
+%post -n python-avahi-gtk
+%desktop_database_post
+
+%postun -n python-avahi-gtk
+%desktop_database_post
+
+%post -n avahi-utils-gtk
+%desktop_database_post
+
+%postun -n avahi-utils-gtk
+%desktop_database_post
 %endif
 %if %build_qt3
 
diff --git a/avahi-mono.spec b/avahi-mono.spec
index 1e18b26..77b1462 100644
--- a/avahi-mono.spec
+++ b/avahi-mono.spec
@@ -782,7 +782,7 @@ install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png
 install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
 install -m 644 avahi-discover-standalone/avahi-discover.ui $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
 %endif
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
 %else
 # There is no simple way to not install core files. Remove them here.
 # The rest is enabled/disabled in configure as needed.
@@ -910,6 +910,18 @@ fi
 %post -n libavahi-glib1 -p /sbin/ldconfig
 
 %postun -n libavahi-glib1 -p /sbin/ldconfig
+
+%post -n python-avahi-gtk
+%desktop_database_post
+
+%postun -n python-avahi-gtk
+%desktop_database_post
+
+%post -n avahi-utils-gtk
+%desktop_database_post
+
+%postun -n avahi-utils-gtk
+%desktop_database_post
 %endif
 %if %build_qt3
 
diff --git a/avahi-qt4.spec b/avahi-qt4.spec
index 2946994..a60b73b 100644
--- a/avahi-qt4.spec
+++ b/avahi-qt4.spec
@@ -785,7 +785,7 @@ install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png
 install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
 install -m 644 avahi-discover-standalone/avahi-discover.ui $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
 %endif
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
 %else
 # There is no simple way to not install core files. Remove them here.
 # The rest is enabled/disabled in configure as needed.
@@ -913,6 +913,18 @@ fi
 %post -n libavahi-glib1 -p /sbin/ldconfig
 
 %postun -n libavahi-glib1 -p /sbin/ldconfig
+
+%post -n python-avahi-gtk
+%desktop_database_post
+
+%postun -n python-avahi-gtk
+%desktop_database_post
+
+%post -n avahi-utils-gtk
+%desktop_database_post
+
+%postun -n avahi-utils-gtk
+%desktop_database_post
 %endif
 %if %build_qt3
 
diff --git a/avahi.changes b/avahi.changes
index 2f5b197..517be99 100644
--- a/avahi.changes
+++ b/avahi.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sun Feb 13 13:48:53 CET 2011 - vuntz@opensuse.org
+
+- Call relevant macros in %post/%postun:
+  + %desktop_database_post/postun because the package ships at
+    least one desktop file.
+- Pass %{?no_lang_C} to %find_lang so that english documentation
+  can be packaged with the program, and not in the lang subpackage.
+
 -------------------------------------------------------------------
 Tue Dec  7 21:18:09 UTC 2010 - coolo@novell.com
 
diff --git a/avahi.spec b/avahi.spec
index cfbc055..434b18f 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -785,7 +785,7 @@ install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png
 install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
 install -m 644 avahi-discover-standalone/avahi-discover.ui $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
 %endif
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
 %else
 # There is no simple way to not install core files. Remove them here.
 # The rest is enabled/disabled in configure as needed.
@@ -913,6 +913,18 @@ fi
 %post -n libavahi-glib1 -p /sbin/ldconfig
 
 %postun -n libavahi-glib1 -p /sbin/ldconfig
+
+%post -n python-avahi-gtk
+%desktop_database_post
+
+%postun -n python-avahi-gtk
+%desktop_database_post
+
+%post -n avahi-utils-gtk
+%desktop_database_post
+
+%postun -n avahi-utils-gtk
+%desktop_database_post
 %endif
 %if %build_qt3