diff -Nru /tmp/1w7pIxbseq/avahi-0.6.20/debian/avahi-daemon.postinst /tmp/VbPOhgE3pj/avahi-0.6.20/debian/avahi-daemon.postinst
--- /tmp/1w7pIxbseq/avahi-0.6.20/debian/avahi-daemon.postinst	2008-01-18 16:49:59.000000000 +0100
+++ /tmp/VbPOhgE3pj/avahi-0.6.20/debian/avahi-daemon.postinst	2008-01-18 16:50:00.000000000 +0100
@@ -36,13 +36,13 @@
       invoke-rc.d dbus force-reload || true
     fi
     
-    # Temporarily revert the avahi fix for LP #173470 by updating the links
-    # to the init script to use the old sequence number 24
-    if dpkg --compare-versions "$2" eq "0.6.20-2ubuntu3.1"; then
+    # Update the links to the init script to use the new sequence number 
+    # 18 (to be started before CUPS)
+    if dpkg --compare-versions "$2" lt "0.6.20-2ubuntu3.3"; then
 	echo "Fixing up startup script priorities..."
 	for l in 2 3 4 5; do
-            old=/etc/rc$l.d/S18avahi-daemon
-            new=/etc/rc$l.d/S24avahi-daemon
+            old=/etc/rc$l.d/S24avahi-daemon
+            new=/etc/rc$l.d/S18avahi-daemon
             if [ -e $old ] && ! [ -e $new ]; then
 		mv $old $new
             fi
diff -Nru /tmp/1w7pIxbseq/avahi-0.6.20/debian/changelog /tmp/VbPOhgE3pj/avahi-0.6.20/debian/changelog
--- /tmp/1w7pIxbseq/avahi-0.6.20/debian/changelog	2008-01-18 16:49:59.000000000 +0100
+++ /tmp/VbPOhgE3pj/avahi-0.6.20/debian/changelog	2008-01-18 16:50:00.000000000 +0100
@@ -1,3 +1,16 @@
+avahi (0.6.20-2ubuntu3.3) gutsy-proposed; urgency=low
+
+  * Really solve the CUPS interaction problems (LP: #183652,
+    LP: #173470)
+    - debian/patches/25_avahi-libdns_sd-crash.patch: Added. Fix a 
+      segfault when registering services with libdns_sd before the
+      avahi daemon finished starting up (from upstream SVN)
+    - debian/rules, debian/avahi-daemon.postinst: Reintroduce the 
+      changes of version 0.6.20-2ubuntu3.1, reverted in the previous
+      update.
+
+ -- Hugues Fournier <hugues.fournier@gmail.com>  Fri, 18 Jan 2008 15:28:52 +0100
+
 avahi (0.6.20-2ubuntu3.2) gutsy-updates; urgency=low
 
   * debian/rules, debian/avahi-daemon.postinst: Revert the startup changes of
diff -Nru /tmp/1w7pIxbseq/avahi-0.6.20/debian/patches/25_avahi-libdns_sd-crash.patch /tmp/VbPOhgE3pj/avahi-0.6.20/debian/patches/25_avahi-libdns_sd-crash.patch
--- /tmp/1w7pIxbseq/avahi-0.6.20/debian/patches/25_avahi-libdns_sd-crash.patch	1970-01-01 01:00:00.000000000 +0100
+++ /tmp/VbPOhgE3pj/avahi-0.6.20/debian/patches/25_avahi-libdns_sd-crash.patch	2008-01-18 16:50:00.000000000 +0100
@@ -0,0 +1,20 @@
+diff -Nur avahi-0.6.20/avahi-compat-libdns_sd/compat.c avahi-0.6.20.new/avahi-compat-libdns_sd/compat.c
+--- avahi-0.6.20/avahi-compat-libdns_sd/compat.c	2007-04-12 23:04:45.000000000 +0200
++++ avahi-0.6.20.new/avahi-compat-libdns_sd/compat.c	2008-01-18 15:50:39.000000000 +0100
+@@ -990,6 +990,16 @@
+                     return;
+                 }
+             }
++
++            if (!sdref->service_name_chosen) {
++
++                assert(sdref->service_name);
++                
++                if (!(sdref->service_name_chosen = avahi_strdup(sdref->service_name))) {
++                    reg_report_error(sdref, kDNSServiceErr_NoMemory);
++                    return;
++                }
++            }
+             
+             /* Register the service */
+ 
diff -Nru /tmp/1w7pIxbseq/avahi-0.6.20/debian/rules /tmp/VbPOhgE3pj/avahi-0.6.20/debian/rules
--- /tmp/1w7pIxbseq/avahi-0.6.20/debian/rules	2008-01-18 16:49:59.000000000 +0100
+++ /tmp/VbPOhgE3pj/avahi-0.6.20/debian/rules	2008-01-18 16:50:00.000000000 +0100
@@ -22,7 +22,7 @@
   DEB_CONFIGURE_EXTRA_FLAGS += --disable-stack-protector
 endif
 
-DEB_DH_INSTALLINIT_ARGS := -- start 24 2 3 4 5 . stop 16 0 1 6 .
+DEB_DH_INSTALLINIT_ARGS := -- start 18 2 3 4 5 . stop 20 0 1 6 .
 
 ifneq (linux,$(DEB_HOST_ARCH_OS))
 	DEB_CONFIGURE_EXTRA_FLAGS += --disable-autoipd