diff --git a/.cvsignore b/.cvsignore
index 6ad74ae..0fa1a5b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ avahi-0.6.tar.gz
 avahi-0.6.1.tar.gz
 avahi-0.6.3.tar.gz
 avahi-0.6.4.tar.gz
+avahi-0.6.5.tar.gz
diff --git a/avahi.spec b/avahi.spec
index b12443c..b4e78f4 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -3,8 +3,8 @@
 %define WITH_MONO 0
 %endif
 Name:           avahi
-Version:        0.6.4
-Release: 	4
+Version:        0.6.5
+Release: 	1
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -169,6 +169,10 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/avahi-bookmarks $RPM_BUILD_ROOT/%{_mandir}/man1
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
 mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/* $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
 rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/*
+#
+# Make /etc/avahi/etc/localtime owned by avahi:
+mkdir -p $RPM_BUILD_ROOT/etc/avahi/etc
+touch $RPM_BUILD_ROOT/etc/avahi/etc/localtime
 :;
 
 %clean
@@ -187,7 +191,10 @@ if [ "$1" -eq 1 ]; then
 	/sbin/chkconfig --add avahi-daemon >/dev/null 2>&1
    fi;
 #  We should realy make dbus reload the system.d config here. Dunno how though.
-#  kill -HUP `cat /var/run/messagebus.pid` ?   
+#  kill -HUP `cat /var/run/messagebus.pid` ? 
+   if [ -s /etc/localtime ]; then
+	cp -fp /etc/localtime /etc/avahi/etc/localtime || :;
+   fi;
 elif [ "$1" -gt 1 ]; then
    if ! /sbin/chkconfig --list avahi-daemon >/dev/null 2>&1 ; then
    # if user has not configured avahi service at all 
@@ -221,6 +228,8 @@ fi
 %doc docs/* avahi-daemon/example.service avahi-daemon/ssh.service
 %attr(755,root,root) %{_sysconfdir}/rc.d/init.d/*
 %dir %{_sysconfdir}/avahi
+%dir %{_sysconfdir}/avahi/etc
+%ghost %{_sysconfdir}/avahi/etc/localtime
 %dir %{_sysconfdir}/avahi/services
 %dir %{_localstatedir}/run/avahi-daemon
 %config %{_sysconfdir}/avahi/avahi-daemon.conf
@@ -291,6 +300,11 @@ fi
 %endif
 
 %changelog
+* Thu Jan 26 2006 Jason Vas Dias <jvdias@redhat.com> - 0.6.5-1
+- Upgrade to upstream version 0.6.5
+- Make /etc/avahi/etc and /etc/avahi/etc/localtime owned by avahi
+  package; copy system localtime into chroot in post
+
 * Mon Jan 23 2006 Jason Vas Dias <jvdias@redhat.com> - 0.6.4-4
 - fix bug 178689: copy localtime to chroot
 - fix bug 178784: fix avahi-dnsconfd initscript 
diff --git a/sources b/sources
index 7497259..34971bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-12eb941043f26f82c51e99821ac52c44  avahi-0.6.4.tar.gz
+1ecbc3534e3b45cf15269a3f4cfe1dca  avahi-0.6.5.tar.gz