diff --git a/.cvsignore b/.cvsignore
index 8d15306..a801f8d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ddclient-3.6.3.tar.gz
+ddclient-3.6.6.tar.bz2
diff --git a/ddclient.cache.patch b/ddclient.cache.patch
index d957c83..ab03b50 100644
--- a/ddclient.cache.patch
+++ b/ddclient.cache.patch
@@ -1,15 +1,14 @@
-diff -Naur ddclient-3.6.3/ddclient ddclient-3.6.3.patched/ddclient
---- ddclient-3.6.3/ddclient	2003-06-14 19:39:16.000000000 +0200
-+++ ddclient-3.6.3.patched/ddclient	2003-09-04 12:25:55.000000000 +0200
-@@ -21,6 +21,7 @@
+--- ddclient-3.6.6/ddclient.cache	2005-03-20 13:01:23.000000000 +0200
++++ ddclient-3.6.6/ddclient	2005-07-30 23:27:07.000000000 +0300
+@@ -23,6 +23,7 @@
  my $now       = time;
  my $hostname  = hostname();
- my $etc       = ($program =~ /test/i) ? './'   : '/etc/';
+ my $etc       = ($program =~ /test/i) ? './'   : '/etc/ddclient/';
 +my $cache     = ($program =~ /test/i) ? './'   : '/var/cache/';
  my $savedir   = ($program =~ /test/i) ? 'URL/' : '/tmp/';
  my $msgs      = '';
  my $last_msgs = '';
-@@ -184,7 +185,7 @@
+@@ -217,7 +218,7 @@
      'global-defaults'    => {
  	'daemon'              => setv(T_DELAY, 0, 0, 1, 0,                    interval('60s')),
  	'file'                => setv(T_FILE,  0, 0, 1, "$etc$program.conf",  undef),
diff --git a/ddclient.initscript b/ddclient.initscript
index f25d09d..6094348 100755
--- a/ddclient.initscript
+++ b/ddclient.initscript
@@ -2,7 +2,7 @@
 #
 # ddclient      This shell script takes care of starting and stopping ddclient.
 #
-# chkconfig:    345 65 35
+# chkconfig:    - 65 35
 # description:  ddclient provides support for updating dynamic DNS services
 # processname:  ddclient
 # config:       /etc/sysconfig/ddclient
diff --git a/ddclient.spec b/ddclient.spec
index 34549a3..c93e3cf 100644
--- a/ddclient.spec
+++ b/ddclient.spec
@@ -1,13 +1,12 @@
 Name:           ddclient
-Version:        3.6.3
-Release:        5
-
+Version:        3.6.6
+Release:        1%{?dist}
 Summary:        Client to update dynamic DNS host entries
 
 Group:          System Environment/Daemons
 License:        GPL
-URL:            http://burry.ca:4141/ddclient
-Source:         http://members.rogers.com/ddclient/pub/%{name}-%{version}.tar.gz
+URL:            http://ddclient.sourceforge.net/
+Source0:        http://download.sf.net/ddclient/%{name}-%{version}.tar.bz2
 Source2:        ddclient.initscript
 Source3:        ddclient.sysconfig
 # Patch hardcodes cache location to /var/cache.
@@ -24,7 +23,9 @@ on many dynamic DNS services.
 %prep
 %setup -q
 %patch -p1
-
+rm sample-etc_rc.d_init.d_ddclient*
+# Backwards compatibility from pre-3.6.6-1
+sed -i -e 's|/etc/ddclient/|%{_sysconfdir}/|' ddclient
 
 %build
 
@@ -36,9 +37,10 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -p ddclient $RPM_BUILD_ROOT%{_sbindir}
-install -p sample-etc_ddclient.conf $RPM_BUILD_ROOT%{_sysconfdir}/ddclient.conf
+install -pm 600 sample-etc_ddclient.conf \
+  $RPM_BUILD_ROOT%{_sysconfdir}/ddclient.conf
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/ddclient
-install -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ddclient
+install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ddclient
 mkdir -p $RPM_BUILD_ROOT/var/cache
 touch $RPM_BUILD_ROOT/var/cache/ddclient.cache
 
@@ -58,20 +60,30 @@ if [ $1 -eq 0 ]; then
         /sbin/chkconfig --del ddclient
 fi
 
+%postun
+if [ $1 -ge 1 ]; then
+        /sbin/service ddclient condrestart >/dev/null
+fi
 
 %files
 %defattr(-,root,root,-)
-%doc README* COPYING COPYRIGHT
-%doc %attr(0644, root, root) sample*
+%doc README* COPYING COPYRIGHT Changelog sample-*
 %{_sbindir}/ddclient
-%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/ddclient.conf
+%config(noreplace) %{_sysconfdir}/ddclient.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/ddclient
 %ghost %attr(0600, root, root) /var/cache/ddclient.cache
 %{_initrddir}/ddclient
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Sat Jul 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 3.6.6-1
+- 3.6.6, update URLs (#165272).
+- Restart service on future package upgrades (still manually needed this time).
+- Don't set service to autostart on "chkconfig --add".
+- Fix sysconfig/ddclient permissions.
+- Drop non-useful samples.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 3.6.3-5
 - rebuilt
 
 * Mon Apr 05 2004 Toshio Kuratomi <toshio[+]tiki-lounge.com> - 0:3.6.3-0.fdr.4.fc1
diff --git a/sources b/sources
index ea60e93..be68acc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dfa5ff6967cb854de804d4e7b9633fdc  ddclient-3.6.3.tar.gz
+5fd0f82446fbed857c841a4deb83cdb9  ddclient-3.6.6.tar.bz2