diff --git a/.cvsignore b/.cvsignore
index 42baf3a..46a1af1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 nsd-2.3.5.tar.gz
+nsd-2.3.6.tar.gz
diff --git a/nsd.init b/nsd.init
index 3ce0bf5..5e24f46 100755
--- a/nsd.init
+++ b/nsd.init
@@ -26,11 +26,12 @@
 #ZONEC_VERBOSE=-v
 OTHER_NSD_OPTS=""
 
+#fixed in 2.3.6
 #work around for bug in nsd-2.3.x when no ipv6 is available
-if [ ! -d /proc/sys/net/ipv6/ ]
-then
-        OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS"
-fi
+#if [ ! -d /proc/sys/net/ipv6/ ]
+#then
+#        OTHER_NSD_OPTS="-4 $OTHER_NSD_OPTS"
+#fi
 
 # Source function library.
 . /etc/init.d/functions
diff --git a/nsd.spec b/nsd.spec
index 9677709..07e67f0 100644
--- a/nsd.spec
+++ b/nsd.spec
@@ -1,7 +1,7 @@
 Summary: NSD is a complete implementation of an authoritative DNS name server
 Name: nsd
-Version: 2.3.5
-Release: 4%{?dist}
+Version: 2.3.6
+Release: 1%{?dist}
 License: BSD-like
 Url: http://open.nlnetlabs.nl/nsd/
 Source: http://open.nlnetlabs.nl/downloads/nsd/%{name}-%{version}.tar.gz
@@ -55,9 +55,6 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %pre
 if getent passwd nsd >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -d /etc/nsd -r -s /sbin/nologin nsd >/dev/null 2>&1 || exit 1 ; fi
-if [ $1 = 2 -a -f /%{_localstatedir}/run/%{name}/%{name}.pid ]; then
-	/sbin/service %{name} stop
-fi
 # "Everyone is doing it, so why can't we?" 
 exit 0
 
@@ -66,16 +63,22 @@ exit 0
 
 %preun
 if [ $1 -eq 0 ]; then
-        /sbin/service %{name} stop > /dev/null 2>&1
+  echo " preun "
+        /sbin/service %{name} stop 
         /sbin/chkconfig --del %{name} 
 fi
 
 %postun
 if [ "$1" -ge "1" ]; then
-  /sbin/service %{name} condrestart 2>&1 >/dev/null
+  /sbin/service %{name} condrestart 
 fi
 
 %changelog
+* Thu Oct 12 2006  Paul Wouters <paul@xelerance.com> 2.3.6-1
+- Upgraded to 2.3.6
+- Removed obsolete workaround in nsd.init
+- Fixed spec file so daemon gets properly restarted on upgrade
+
 * Mon Sep 11 2006 Paul Wouters <paul@xelerance.com> 2.3.5-4
 - Rebuild requested for PT_GNU_HASH support from gcc
 - Removed dbaccess.c from doc section
diff --git a/sources b/sources
index c0f9727..424aa19 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 e9dfb18d544cd37c57b05a91384037e9  nsd-2.3.5.tar.gz
+72428cdacc5bee63b4477becda27bf64  nsd-2.3.6.tar.gz