diff --git a/pool_process_query-2.0.1.patch b/pool_process_query-2.0.1.patch
deleted file mode 100644
index e8ba4dc..0000000
--- a/pool_process_query-2.0.1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-*** pool_process_query.c	2007/11/21 09:37:39	1.79
---- pool_process_query.c.old	2007/12/01 13:26:36	1.80
-***************
-*** 1,6 ****
-  /* -*-pgsql-c-*- */
-  /*
-!  * $Header: /home/fedora/jkeating/pkgs/rpms/postgresql-pgpool-II/devel/Attic/pool_process_query-2.0.1.patch,v 1.1 2008/01/14 08:24:24 devrim Exp $
-   *
-   * pgpool: a language independent connection pool server for PostgreSQL 
-   * written by Tatsuo Ishii
---- 1,6 ----
-  /* -*-pgsql-c-*- */
-  /*
-!  * $Header: /home/fedora/jkeating/pkgs/rpms/postgresql-pgpool-II/devel/Attic/pool_process_query-2.0.1.patch,v 1.1 2008/01/14 08:24:24 devrim Exp $
-   *
-   * pgpool: a language independent connection pool server for PostgreSQL 
-   * written by Tatsuo Ishii
-*************** POOL_STATUS SimpleForwardToBackend(char 
-*** 3895,3901 ****
-  
-  	if (kind == 'S') /* Sync message? */
-  	{
-- 		pool_log("YYYYY");
-  		receive_sync = 1;
-  	}
-  
---- 3895,3900 ----
diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index a599e93..a831769 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -2,16 +2,15 @@
 
 Summary:	Pgpool is a connection pooling/replication server for PostgreSQL
 Name:		postgresql-%{short_name}
-Version:	2.0.1
-Release:	3%{?dist}.1
+Version:	2.1
+Release:	beta2%{?dist}.1
 License:	BSD
 Group:		Applications/Databases
 URL:		http://pgpool.projects.PostgreSQL.org/pgpool-II/en
-Source0:	http://pgfoundry.org/frs/download.php/1521/%{short_name}-%{version}.tar.gz
+Source0:	http://pgfoundry.org/frs/download.php/1726/%{short_name}-%{version}.tar.gz
 Source1:        pgpool.init
 Source2:        pgpool.sysconfig
 Patch1:		pgpool.conf.sample.patch
-Patch4:		pool_process_query-%{version}.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	postgresql-devel pam-devel
 
@@ -38,15 +37,14 @@ DB nodes to be connected, which was not possible in pgpool-I.
 %package devel
 Summary:	The  development files for pgpool-II
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-beta2
 
 %description devel
 Development headers and libraries for pgpool-II.
 
 %prep
-%setup -q -n %{short_name}-%{version}
+%setup -q -n %{short_name}-%{version}-beta2
 %patch1 -p0
-%patch4 -p0
 
 %build
 %configure --with-pgsql-includedir=%{_includedir}/pgsql --with-pgsql-lib=%{_libdir}/pgsql --disable-static --with-pam --disable-rpath
@@ -58,6 +56,8 @@ rm -rf %{buildroot}
 make %{?_smp_flags} DESTDIR=%{buildroot} install
 install -d %{buildroot}%{_datadir}/%{short_name}
 mv %{buildroot}/%{_sysconfdir}/*.conf.sample %{buildroot}%{_datadir}/%{short_name}
+mv %{buildroot}%{_datadir}/%{short_name}/system_db.sql %{buildroot}%{_datadir}/%{name}
+mv %{buildroot}%{_datadir}/%{short_name}/pgpool.pam %{buildroot}%{_datadir}/%{name}
 install -d %{buildroot}%{_initrddir}
 install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/pgpool
 install -d %{buildroot}%{_sysconfdir}/sysconfig
@@ -85,8 +85,8 @@ chkconfig --add pgpool
 %{_bindir}/pcp_node_info
 %{_bindir}/pcp_proc_count
 %{_bindir}/pcp_proc_info
-%{_bindir}/pcp_stop_pgpool
 %{_bindir}/pcp_recovery_node
+%{_bindir}/pcp_stop_pgpool
 %{_bindir}/pcp_systemdb_info
 %{_bindir}/pg_md5
 %{_mandir}/man8/pgpool*
@@ -104,6 +104,9 @@ chkconfig --add pgpool
 %{_libdir}/libpcp.so
 
 %changelog
+* Sun Apr 6 2008 Devrim Gunduz <devrim@CommandPrompt.com> 2.1-beta2
+- Update to 2.1 beta2
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.0.1-3.1
 - Autorebuild for GCC 4.3