diff --git a/.gitignore b/.gitignore
index bfa9270..2cd9e46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/postgresql-16.13.tar.bz2
-SOURCES/postgresql-18.3.tar.bz2
+SOURCES/postgresql-16.14.tar.bz2
+SOURCES/postgresql-18.4.tar.bz2
 SOURCES/postgresql-setup-8.9.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index 09fda59..e5d8700 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,3 +1,3 @@
-b66b3bf5bf717f37371dc3fd8de8831d1f26dd40 SOURCES/postgresql-16.13.tar.bz2
-715414a7dcf6ca491588b1c243610f11acdc501b SOURCES/postgresql-18.3.tar.bz2
+ec6b347c6ae81b9ae9bbbee4a553304aaaa07b65 SOURCES/postgresql-16.14.tar.bz2
+25d1499917475db9f3129a7f658b7b005b577da8 SOURCES/postgresql-18.4.tar.bz2
 25a05ef36218b1de80d8eeb55f4b4e0b723bd7f6 SOURCES/postgresql-setup-8.9.tar.gz
diff --git a/SOURCES/Makefile.regress b/SOURCES/Makefile.regress
old mode 100755
new mode 100644
diff --git a/SOURCES/postgresql-16.13.tar.bz2.sha256 b/SOURCES/postgresql-16.13.tar.bz2.sha256
deleted file mode 100644
index 017f6bc..0000000
--- a/SOURCES/postgresql-16.13.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-dc2ddbbd245c0265a689408e3d2f2f3f9ba2da96bd19318214b313cdd9797287  postgresql-16.13.tar.bz2
diff --git a/SOURCES/postgresql-16.14.tar.bz2.sha256 b/SOURCES/postgresql-16.14.tar.bz2.sha256
new file mode 100644
index 0000000..35d546d
--- /dev/null
+++ b/SOURCES/postgresql-16.14.tar.bz2.sha256
@@ -0,0 +1 @@
+f6d077142737920858ce958ccdb75c6ee137a63b5b0853c70693d401ac7e3471  postgresql-16.14.tar.bz2
diff --git a/SOURCES/postgresql-18.3.tar.bz2.sha256 b/SOURCES/postgresql-18.3.tar.bz2.sha256
deleted file mode 100644
index 44943e1..0000000
--- a/SOURCES/postgresql-18.3.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-d95663fbbf3a80f81a9d98d895266bdcb74ba274bcc04ef6d76630a72dee016f  postgresql-18.3.tar.bz2
diff --git a/SOURCES/postgresql-18.4.tar.bz2.sha256 b/SOURCES/postgresql-18.4.tar.bz2.sha256
new file mode 100644
index 0000000..24712a0
--- /dev/null
+++ b/SOURCES/postgresql-18.4.tar.bz2.sha256
@@ -0,0 +1 @@
+81a81ec695fb0c7901407defaa1d2f7973617154cf27ba74e3a7ab8e64436094  postgresql-18.4.tar.bz2
diff --git a/SOURCES/postgresql-bashprofile b/SOURCES/postgresql-bashprofile
old mode 100755
new mode 100644
diff --git a/SOURCES/postgresql-external-libpq.patch b/SOURCES/postgresql-external-libpq.patch
old mode 100755
new mode 100644
diff --git a/SOURCES/postgresql-logging.patch b/SOURCES/postgresql-logging.patch
old mode 100755
new mode 100644
diff --git a/SOURCES/postgresql-no-libecpg.patch b/SOURCES/postgresql-no-libecpg.patch
old mode 100755
new mode 100644
diff --git a/SOURCES/postgresql-server-pg_config.patch b/SOURCES/postgresql-server-pg_config.patch
old mode 100755
new mode 100644
diff --git a/SOURCES/postgresql-var-run-socket.patch b/SOURCES/postgresql-var-run-socket.patch
old mode 100755
new mode 100644
diff --git a/SOURCES/postgresql.pam b/SOURCES/postgresql.pam
old mode 100755
new mode 100644
diff --git a/SOURCES/rpm-pgsql.patch b/SOURCES/rpm-pgsql.patch
old mode 100755
new mode 100644
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
old mode 100755
new mode 100644
index cee9319..376d627
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -62,7 +62,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 18
-Version: %{majorversion}.3
+Version: %{majorversion}.4
 Release: 2%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -75,7 +75,7 @@ Url: http://www.postgresql.org/
 # that this be kept up with the latest minor release of the previous series;
 # but update when bugs affecting pg_dump output are fixed.
 %global prevmajorversion 16
-%global prevversion %{prevmajorversion}.13
+%global prevversion %{prevmajorversion}.14
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
@@ -1234,6 +1234,10 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Wed May 28 2026 Filip Janus <fjanus@redhat.com> - 18.4-1
+- Update to 18.4
+- Fix CVE-2026-6478
+
 * Thu Feb 26 2026 Lukas Javorsky <ljavorsk@redhat.com> - 18.3-2
 - Enable pltcl subpackage