diff --git a/.gitignore b/.gitignore
index 3c38c41..edba453 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 pnp-0.4.14.tar.gz
+/pnp4nagios-0.6.1.tar.gz
diff --git a/pnp4nagios.spec b/pnp4nagios.spec
index 6adbef1..74dd296 100644
--- a/pnp4nagios.spec
+++ b/pnp4nagios.spec
@@ -1,12 +1,12 @@
 Name:           pnp4nagios
-Version:        0.4.14
-Release:        7%{?dist}
+Version:        0.6.1
+Release:        3%{?dist}
 Summary:        Nagios performance data analysis tool
 
 Group:          Applications/System
 License:        GPLv2
 URL:            http://www.pnp4nagios.org/
-Source0:        http://downloads.sourceforge.net/%{name}/pnp-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        pnp4nagios.logrotate.conf
 Source2:        pnp4nagios-npcd.sysvinit
 Source3:        pnp4nagios-README.fedora
@@ -32,23 +32,23 @@ and stores them automatically into RRD-databases.
 
 
 %prep
-%setup -q -n pnp-%{version}
+%setup -q
 
 # Move broker to a better location
-%patch1 -p0
+#%patch1 -p0
 
 # Update verify_pnp_config script for bugfixes
-%patch2 -p1
+#%patch2 -p1
 
 # Fix PHP deprecated warnings with php 5.3
-%patch3 -p0
+#%patch3 -p0
 
 # Fix file encoding and end of line
 pushd contrib
-iconv -f iso8859-1 -t utf-8 verify_pnp_config.txt > verify_pnp_config.txt.utf8
-touch -r verify_pnp_config.txt verify_pnp_config.txt.utf8
-mv -f verify_pnp_config.txt.utf8 verify_pnp_config.txt
-sed -i -e "s/\r//" verify_pnp_config.txt
+#iconv -f iso8859-1 -t utf-8 verify_pnp_config.txt > verify_pnp_config.txt.utf8
+#touch -r verify_pnp_config.txt verify_pnp_config.txt.utf8
+#mv -f verify_pnp_config.txt.utf8 verify_pnp_config.txt
+#sed -i -e "s/\r//" verify_pnp_config.txt
 popd
 
 cp -p %{SOURCE3} README.fedora
@@ -69,24 +69,29 @@ sed -i -e '/^\t$(MAKE) strip-post-install$/d' src/Makefile.in
 make %{?_smp_mflags} all
 
 # Remove unwanted file from the contrib directory
-rm contrib/verify_pnp_config.in 
+#rm contrib/verify_pnp_config.in 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT 
 make install-config DESTDIR=$RPM_BUILD_ROOT 
-find $RPM_BUILD_ROOT/%{_sysconfdir}/pnp4nagios -name *-sample -exec rename "-sample" "" {} ';'
-sed -i -e 's|/usr/libexec/process_perfdata.pl|/usr/libexec/pnp4nagios/process_perfdata.pl|' \
-       -e 's|^log_type = syslog|log_type = file|' \
-       $RPM_BUILD_ROOT/%{_sysconfdir}/pnp4nagios/npcd.cfg
+# remove -sample from filename suffix
+for i in $RPM_BUILD_ROOT/%{_sysconfdir}/pnp4nagios/*-sample; do
+  mv ${i} ${i%%-sample}
+done
+#sed -i -e 's|/usr/libexec/process_perfdata.pl|/usr/libexec/pnp4nagios/process_perfdata.pl|' \
+#       -e 's|^log_type = syslog|log_type = file|' \
+#       $RPM_BUILD_ROOT/%{_sysconfdir}/pnp4nagios/npcd.cfg
 
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
 install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/pnp4nagios
 install -Dp -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/npcd
-
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/nagios/brokers
+mv $RPM_BUILD_ROOT%{_sbindir}/npcdmod.o \
+   $RPM_BUILD_ROOT%{_libdir}/nagios/brokers/npcdmod.o
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -111,8 +116,8 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README README.fedora
-%doc README.npcd THANKS TODO contrib/
+%doc AUTHORS ChangeLog COPYING INSTALL README README.fedora
+%doc THANKS contrib/
 %dir %{_sysconfdir}/pnp4nagios
 %config(noreplace) %{_sysconfdir}/pnp4nagios/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/pnp4nagios
@@ -122,13 +127,22 @@ fi
 %dir %{_libexecdir}/pnp4nagios
 %attr(755,root,root) %{_libexecdir}/pnp4nagios/process_perfdata.pl
 %attr(755,root,root) %{_libexecdir}/pnp4nagios/check_pnp_rrds.pl
+%attr(755,root,root) %{_libexecdir}/pnp4nagios/verify_pnp_config.pl
 %attr(755,nagios,nagios) %{_localstatedir}/lib/%{name}
 %attr(755,nagios,nagios) %{_localstatedir}/log/%{name}
 %attr(755,nagios,nagios) %{_localstatedir}/spool/%{name}
 %{_datadir}/nagios/html/pnp4nagios
-
+# kohana
+%dir %{_libdir}/kohana/system
+%{_libdir}/kohana/system
 
 %changelog
+* Tue Oct 11 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.1-3
+- Updated renaming of "-sample" config files.
+
+* Wed Sep 14 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.6.1-1
+- Update to 0.6.1.
+
 * Tue Sep 13 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 0.4.14-7
 - added perl-Time-HiRes to build requires
 
diff --git a/sources b/sources
index c64fb69..f010b6b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 9dbbf08191a258f6798c9516b3821ff0  pnp-0.4.14.tar.gz
+a8afe81ac5502ee8ec12d77a0203b6d4  pnp4nagios-0.6.1.tar.gz