diff --git a/.cvsignore b/.cvsignore
index 2adaf58..2b3e90a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-nrpe-2.5.2.tar.gz
+nrpe-2.12.tar.gz
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..69369ff
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+nrpe-2_12-6_fc10:EL-4:nrpe-2.12-6.fc10.src.rpm:1233591215
diff --git a/nrpe-read-extra-conf.patch b/nrpe-read-extra-conf.patch
new file mode 100644
index 0000000..1aaa32d
--- /dev/null
+++ b/nrpe-read-extra-conf.patch
@@ -0,0 +1,23 @@
+--- init-script.in~	2009-01-30 18:34:49.509236950 +0300
++++ init-script.in	2009-01-30 18:37:09.797598582 +0300
+@@ -24,6 +24,11 @@
+ # Source networking configuration.
+ . /etc/sysconfig/network
+ 
++# Read configuration (environment etc.) for nrpe and plugins
++if [ -f /etc/sysconfig/nrpe ]; then
++    . /etc/sysconfig/nrpe
++fi
++
+ # Check that networking is up.
+ [ ${NETWORKING} = "no" ] && exit 0
+ 
+@@ -36,7 +41,7 @@
+   start)
+ 	# Start daemons.
+ 	echo -n "Starting nrpe: "
+-	daemon $NrpeBin -c $NrpeCfg -d
++	daemon $NrpeBin -c $NrpeCfg -d $NRPE_SSL_OPT
+ 	echo
+ 	touch $LockFile
+ 	;;
diff --git a/nrpe.spec b/nrpe.spec
index 2982728..90460ab 100644
--- a/nrpe.spec
+++ b/nrpe.spec
@@ -2,14 +2,17 @@
 
 Name: nrpe
 Version: 2.12
-Release: 3%{?dist}
+Release: 6%{?dist}
 Summary: Host/service/network monitoring agent for Nagios
 
 Group: Applications/System
 License: GPLv2
 URL: http://www.nagios.org
-Source: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
+Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
+Source1: nrpe.sysconfig
 Patch0: nrpe-initreload.patch
+Patch1:	nrpe-read-extra-conf.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openssl-devel tcp_wrappers
@@ -18,7 +21,7 @@ Requires(pre): %{_sbindir}/useradd
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(post): /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/service
-Provides: nagios-nrpe
+Provides: nagios-nrpe = %{version}-%{release}
 
 %description
 Nrpe is a system daemon that will execute various Nagios plugins
@@ -33,7 +36,7 @@ This package provides the core agent.
 Group: Applications/System
 Summary: Provides nrpe plugin for Nagios
 Requires: nagios-plugins
-Provides: check_nrpe
+Provides: check_nrpe = %{version}-%{release}
 
 %description -n nagios-plugins-nrpe
 Nrpe is a system daemon that will execute various Nagios plugins
@@ -47,6 +50,7 @@ This package provides the nrpe plugin for Nagios-related applications.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0 -b .sysconfig
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
@@ -67,10 +71,11 @@ sed -i "s/# chkconfig: 2345/# chkconfig: - /" init-script
 
 %install
 rm -rf %{buildroot}
-install -D -m 0755 init-script %{buildroot}/%{_initrddir}/nrpe
-install -D -m 0644 sample-config/nrpe.cfg %{buildroot}/%{_sysconfdir}/nagios/nrpe.cfg
-install -D -m 0755 src/nrpe %{buildroot}/%{_sbindir}/nrpe
-install -D -m 0755 src/check_nrpe %{buildroot}/%{_libdir}/nagios/plugins/check_nrpe
+install -D -p -m 0755 init-script %{buildroot}/%{_initrddir}/nrpe
+install -D -p -m 0644 sample-config/nrpe.cfg %{buildroot}/%{_sysconfdir}/nagios/nrpe.cfg
+install -D -p -m 0755 src/nrpe %{buildroot}/%{_sbindir}/nrpe
+install -D -p -m 0755 src/check_nrpe %{buildroot}/%{_libdir}/nagios/plugins/check_nrpe
+install -D -p -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
 
 %clean
 rm -rf %{buildroot}
@@ -98,14 +103,25 @@ fi
 %{_sbindir}/nrpe
 %dir %{_sysconfdir}/nagios
 %config(noreplace) %{_sysconfdir}/nagios/nrpe.cfg
-%doc Changelog LEGAL README 
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%doc Changelog LEGAL README
 
 %files -n nagios-plugins-nrpe
 %defattr(-,root,root,-)
 %{_libdir}/nagios/*
-%doc Changelog LEGAL README
+%doc Changelog LEGAL README README.SSL SECURITY docs/NRPE.pdf
 
 %changelog
+* Mon Feb  2 2009 Peter Lemenkov <lemenkov@gmail.com> - 2.12-6
+- Fixed BZ# 449174
+- Clean up (in order to disable rpmlint warnings)
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz@redhat.com> - 2.12-5
+- rebuild with new openssl
+
+* Sun Dec 21 2008 Mike McGrath <mmcgrath@redhat.com> - 2.12-4
+- Added some doc lines for ticket 477527
+
 * Fri Dec 19 2008 Mike McGrath <mmcgrath@redhat.com> - 2.12-3
 - Added Provides: nagios-nrpe
 
diff --git a/nrpe.sysconfig b/nrpe.sysconfig
new file mode 100644
index 0000000..e52eae8
--- /dev/null
+++ b/nrpe.sysconfig
@@ -0,0 +1,2 @@
+# specify additional command line arguments for nrpe
+NRPE_SSL_OPT=""