diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
diff --git a/libecpg-12.2-dependency-build.patch b/libecpg-12.2-dependency-build.patch
index 8895434..ff2b36c 100644
--- a/libecpg-12.2-dependency-build.patch
+++ b/libecpg-12.2-dependency-build.patch
@@ -2,10 +2,10 @@ diff -ur postgresql-14.4_original/src/interfaces/libpq/Makefile postgresql-14.4/
 --- postgresql-14.4_original/src/interfaces/libpq/Makefile	2022-06-22 12:24:56.506658251 +0200
 +++ postgresql-14.4/src/interfaces/libpq/Makefile	2022-06-22 12:25:46.222779323 +0200
 @@ -98,8 +98,6 @@
- PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto
+ PKG_CONFIG_REQUIRES_PRIVATE = libssl, libcrypto
  endif
  
--all: all-lib
+-all: all-lib libpq-refs-stamp
 -
  # Shared library stuff
  include $(top_srcdir)/src/Makefile.shlib
diff --git a/libecpg-12.2-external-libpq.patch b/libecpg-12.2-external-libpq.patch
index 668c771..04ffb2a 100644
--- a/libecpg-12.2-external-libpq.patch
+++ b/libecpg-12.2-external-libpq.patch
@@ -24,7 +24,7 @@ diff -ur postgresql-12.2/src/Makefile.global.in postgresql-12.2_patch/src/Makefi
 +libpq = -lpq
  
  # libpq_pgport is for use by client executables (not libraries) that use libpq.
- # We force clients to pull symbols from the non-shared libraries libpgport
+ # We want clients to pull symbols from the non-shared libraries libpgport
 @@ -580,7 +580,6 @@
  # Commonly used submake targets
  
diff --git a/libecpg.spec b/libecpg.spec
index 5cee570..21f6b1d 100644
--- a/libecpg.spec
+++ b/libecpg.spec
@@ -1,9 +1,9 @@
-%global majorversion 14
+%global majorversion 16
 
 Summary: ECPG - Embedded SQL in C
 Name: libecpg
 Version: %majorversion.4
-Release: 5%{?dist}
+Release: 3%{?dist}
 
 License: PostgreSQL
 Url: http://www.postgresql.org/
@@ -29,6 +29,7 @@ BuildRequires: libpq-devel
 BuildRequires: gettext
 BuildRequires: multilib-rpm-config
 BuildRequires: make
+BuildRequires: libicu-devel
 
 Requires: libpgtypes = %{version}-%{release}
 
@@ -69,6 +70,7 @@ find . -type f -name .gitignore | xargs rm
 
 
 %build
+export CFLAGS="$CFLAGS -std=c17"
 # We don't build server nor client (e.g. /bin/psql) binaries in this package, so
 # we can disable some configure options.
 %configure \
@@ -80,7 +82,7 @@ find . -type f -name .gitignore | xargs rm
     --without-readline \
     --datadir=%_datadir/pgsql
 
-%make_build -C "src/interfaces/ecpg"
+%make_build -C "src/interfaces/ecpg" -j1
 
 
 %install
@@ -131,6 +133,36 @@ find_lang_bins %name-devel.lst  ecpg
 
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 16.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 16.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Aug 29 2024 Ales Nezbeda <anezbeda@redhat.com> - 16.4-1
+- Update to 16.4
+- Fix compilation sometimes failing due to race condition in makefile
+- Resolves: BZ:2290330
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 16.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon May 27 2024 Ales Nezbeda <anezbeda@redhat.com> - 16.3-1
+- Update to 16.3
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 16.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 16.1-1
+- Update to 16.1
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 15.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Aug 22 2023 Ondrej Sloup <osloup@redhat.com> - 15.4-1
+- Rebase to the latest upstream version
+- Update dependency patch file to match the rebase
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 14.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
old mode 100755
new mode 100644
index bee8165..04b03aa
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (postgresql-14.4.tar.bz2) = dd2f80248684e331d2ffb1e26cd2a285df1fb18710807a0c31aedabf917912ce9267f8ca26318e5371d916c6fe476f8a17886d82d3ff86a974e6f24c19a6aafb
-SHA512 (postgresql-14.4.tar.bz2.sha256) = f2f4e5dd260163099742fe8a0ee854d92af425ba52243e699df006ea7c98153961a0ec08f684f3bbdbcc731cafe81621d36a9aad6594c702b54c03e9bb74a7d0
+SHA512 (postgresql-16.4.tar.bz2) = f2070299f0857a270317ac984f8393374cf00d4f32a082fe3c5481e36c560595ea711fed95e40d1bc90c5089edf8f165649d443d8b9c68614e1c83fc91268e96
+SHA512 (postgresql-16.4.tar.bz2.sha256) = f5a33591b4a0810e2f90d21df471ba086acbd1f97099e38aed46e4d3b45ee72037ef5958c7f155dd9fb7969152599fb6946b792a12d92575bfbc595049b74674