diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index c125321..f4d3741 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -9,15 +9,15 @@
 
 Summary:		Pgpool is a connection pooling/replication server for PostgreSQL
 Name:			postgresql-%{short_name}
-Version:		4.2.0
-Release:		7%{?dist}
+Version:		4.3.1
+Release:		1%{?dist}
 License:		BSD
 URL:			http://pgpool.net
 Source0:		http://www.pgpool.net/mediawiki/images/%{short_name}-%{version}.tar.gz
 Source1:		pgpool.service
 Source2:		pgpool.sysconfig
 Source3:		pgpool.init
-BuildRequires: 		make
+BuildRequires:		make
 BuildRequires:		gcc
 BuildRequires:		clang-devel llvm-devel
 BuildRequires:		postgresql-server-devel
@@ -112,8 +112,6 @@ mv %{buildroot}/%{_sysconfdir}/%{short_name}/pool_hba.conf.sample %{buildroot}%{
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/failover.sh.sample %{buildroot}%{_sysconfdir}/%{short_name}/failover.sh
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool_remote_start.sample %{buildroot}%{_sysconfdir}/%{short_name}/pgpool_remote_start
 mv %{buildroot}/%{_sysconfdir}/%{short_name}/recovery_1st_stage.sample %{buildroot}%{_sysconfdir}/%{short_name}/recovery_1st_stage
-mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-replication %{buildroot}%{_datadir}/%{short_name}/
-mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-stream %{buildroot}%{_datadir}/%{short_name}/
 
 %if %{systemd_enabled}
 install -d %{buildroot}%{_unitdir}
@@ -202,8 +200,6 @@ fi
 %{_bindir}/pg_md5
 %dir %{_datadir}/%{short_name}
 %{_datadir}/%{short_name}/insert_lock.sql
-%{_datadir}/%{short_name}/pgpool.conf.sample-replication
-%{_datadir}/%{short_name}/pgpool.conf.sample-stream
 %{_libdir}/libpcp.so.*
 %{_datadir}/%{short_name}/pgpool.pam
 %if %{systemd_enabled}
@@ -216,7 +212,6 @@ fi
 %dir %{_sysconfdir}/%{short_name}
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/%{short_name}/*
 %config(noreplace) %{_sysconfdir}/sysconfig/pgpool
-%{_sysconfdir}/%{short_name}/pgpool.conf.sample-logical
 
 %files devel
 %{_includedir}/libpcp_ext.h
@@ -235,8 +230,10 @@ fi
 %{_datadir}/pgsql/extension/pgpool_recovery--1.1.sql
 %{_datadir}/pgsql/extension/pgpool_recovery--1.2.sql
 %{_datadir}/pgsql/extension/pgpool_recovery--1.3.sql
+%{_datadir}/pgsql/extension/pgpool_recovery--1.4.sql
 %{_datadir}/pgsql/extension/pgpool_recovery--1.1--1.2.sql
 %{_datadir}/pgsql/extension/pgpool_recovery--1.2--1.3.sql
+%{_datadir}/pgsql/extension/pgpool_recovery--1.3--1.4.sql
 %{_datadir}/pgsql/extension/pgpool_recovery.control
 %{_datadir}/pgsql/extension/pgpool-regclass.sql
 %{_datadir}/pgsql/extension/pgpool_regclass--1.0.sql
@@ -247,6 +244,13 @@ fi
 
 
 %changelog
+* Thu May 05 2022 Ondrej Sloup <osloup@redhat.com> - 4.3.1-1
+- Fix mixed spaces and tabs
+- Remove config files as they were unified
+- Fix chronology of changelog made by Mass_Rebuild
+- Add pgpool_recovery 1.4 and 1.3-1.4
+- Rebase to the latest upstream version (rhbz#1870431)
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
@@ -270,7 +274,8 @@ fi
 * Wed Jan 13 2021 Patrik Novotný <panovotn@redhat.com> - 4.2.0-1
 - Rebase to upstream release 4.2.0
 
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.2-3
+* Wed Jan 12 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.2-3
+- This record was edited on May 06 2022, to change the date from Jan 27 to Jan 12 to preserve chronology
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.2-2