diff --git a/nsd.spec b/nsd.spec
index 2c79a46..78ea898 100644
--- a/nsd.spec
+++ b/nsd.spec
@@ -8,8 +8,8 @@
 %define dbfile     %{zonesdir}/nsd.db
 #
 Name: nsd
-Version: 2.3.5
-Release: 2
+Version: 3.0.5
+Release: 0
 #
 License: GPL
 Group: Productivity/Networking/DNS/Servers
@@ -19,10 +19,10 @@ BuildRequires: openssl-devel pkgconfig tcpd-devel
 PreReq: %insserv_prereq %fillup_prereq
 #
 URL: http://open.nlnetlabs.nl/nsd/
-Source: http://www.nlnetlabs.nl/downloads/nsd/nsd-%{version}.tar.gz
+Source: http://open.nlnetlabs.nl/downloads/nsd/nsd-%{version}.tar.gz
 Source1: %{name}.init
-Patch: nsd-2.3.3_ldflags.patch
-Patch1: nsd-2.3.3_implicit_declaration.patch
+#Patch: nsd-2.3.3_ldflags.patch
+#Patch1: nsd-2.3.3_implicit_declaration.patch
 #
 Summary: NSD is an authoritative only, high performance, simple and open source name server. 
 %description
@@ -34,33 +34,42 @@ Authors:
 --------
     NSD team <nsd-team@nlnetlabs.nl>
 
+
+%debug_package
 %prep
 %setup
-%patch
-%patch1
+#%patch
+#%patch1
 
 %build
-autoreconf -fi
-%configure                          \
-    --with-dbfile=%{home}/nsd.db    \
-    --enable-root-server            \
-    --enable-plugins                \
-    --enable-bind8-stats            \
-    --enable-checking               \
-    --enable-mmap                   \
-    --with-user=%{name}             \
+#autoreconf -fi
+%configure                             \
+    --with-zonesdir=%{configdir}       \
+    --with-dbfile=%{home}/nsd.db       \
+    --with-difffile=%{home}/ixfr.db    \
+    --with-xfrdfile=%{home}/xfrd.state \
+    --enable-root-server               \
+    --enable-plugins                   \
+    --enable-bind8-stats               \
+    --enable-nsec3                     \
+    --enable-nsid                      \
+    --enable-mmap                      \
+    --with-user=%{name}                \
     --with-libwrap
 %{__make}
 
 %install
 %makeinstall
 for i in %{buildroot}%{configdir}/*.sample ; do
-    %{__cp} $i ${i%%.sample} ;
+    %{__cp} -v $i ${i%%.sample} ;
 done
-
+#
 %{__install} -D -m 0755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/%{name}
 %{__ln_s} -f %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name}
 %{__install} -Dd -m 0755 %{buildroot}%{home}
+#
+touch %{buildroot}%{home}/{nsd.db,ixfr.db,xfrd.state}
+
 
 
 %clean
@@ -85,7 +94,7 @@ done
 
 %files
 %defattr(-,root,root)
-%doc CREDITS DIFFERENCES LICENSE NSD-DATABASE README README.icc RELNOTES REQUIREMENTS TODO
+%doc doc/*
 %doc contrib/
 %{_sysconfdir}/init.d/%{name}
 %{_sbindir}/rcnsd
@@ -94,13 +103,22 @@ done
 %{_sbindir}/nsd-xfer
 %{_sbindir}/nsdc
 %{_sbindir}/zonec
-%{_mandir}/man8/nsd-notify.8.gz
-%{_mandir}/man8/nsd-xfer.8.gz
-%{_mandir}/man8/nsd.8.gz
-%{_mandir}/man8/nsdc.8.gz
-%{_mandir}/man8/zonec.8.gz
-%dir %attr(750,root,%{name}) %{home}
+%{_sbindir}/nsd-checkconf
+%{_sbindir}/nsd-patch
+%{_mandir}/man5/nsd.conf.5*
+%{_mandir}/man8/nsd-checkconf.8*
+%{_mandir}/man8/nsd-patch.8*
+%{_mandir}/man8/nsd-notify.8*
+%{_mandir}/man8/nsd-xfer.8*
+%{_mandir}/man8/nsd.8*
+%{_mandir}/man8/nsdc.8*
+%{_mandir}/man8/zonec.8*
+%dir %attr(750,%{name},%{name}) %{home}
 %dir %attr(750,root,%{name}) %{configdir}
+%config(noreplace) %attr(640,root,%{name}) %{configdir}/nsd.conf
+%ghost %config %attr(640,%{name},%{name}) %{home}/nsd.db
+%ghost %config %attr(640,%{name},%{name}) %{home}/ixfr.db
+%ghost %config %attr(640,%{name},%{name}) %{home}/xfrd.state
 %attr(640,root,%{name}) %{configdir}/*.sample
-%config(noreplace) %attr(640,root,%{name}) %{configdir}/nsdc.conf
-%config(noreplace) %attr(640,root,%{name}) %{configdir}/nsd.zones
+
+%changelog