diff --git a/.cvsignore b/.cvsignore
index 718c248..9ae6c1e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pgpool-II-2.2.6.tar.gz
+pgpool-II-2.3.1.tar.gz
diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index 2bd5c08..f8ff8bd 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -2,12 +2,12 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.2.6
+Version:	2.3.1
 Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org
-Source0:	http://pgfoundry.org/frs/download.php/2478/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/2506/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
@@ -59,6 +59,9 @@ install -d %{buildroot}%{_sysconfdir}/%{short_name}
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pcp.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pcp.conf
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pgpool.conf
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pool_hba.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pool_hba.conf
+mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-master-slave %{buildroot}%{_datadir}/%{short_name}/
+mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-replication %{buildroot}%{_datadir}/%{short_name}/
+
 install -d %{buildroot}%{_initrddir}
 install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/pgpool
 install -d %{buildroot}%{_sysconfdir}/sysconfig
@@ -99,6 +102,8 @@ fi
 %{_mandir}/man8/pgpool*
 %dir %{_datadir}/%{short_name}
 %{_datadir}/%{short_name}/system_db.sql
+%{_datadir}/%{short_name}/pgpool.conf.sample-master-slave  
+%{_datadir}/%{short_name}/pgpool.conf.sample-replication
 %{_libdir}/libpcp.so.*
 %{_datadir}/%{short_name}/pgpool.pam
 %{_initrddir}/pgpool
@@ -112,6 +117,10 @@ fi
 %{_libdir}/libpcp.so
 
 %changelog
+* Fri Dec 25 2009 Devrim GUNDUZ <devrim@gunduz.org> - 2.3.1-1
+- Update to 2.3.1
+- Adjust order of startup and kill, per RH bugzilla #545739.
+
 * Tue Dec 1 2009 Devrim GUNDUZ <devrim@gunduz.org> - 2.2.6-1
 - Update to 2.2.6
 
diff --git a/sources b/sources
index f5b16c8..59dbedc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-711115ba7a00a9b557c7780a7ec41c3c  pgpool-II-2.2.6.tar.gz
+032fc94eaa71ed99276234b7a110cdf5  pgpool-II-2.3.1.tar.gz