diff --git a/.gitignore b/.gitignore
index 89d4198..5a5a647 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-postgresql-16.13.tar.bz2
-postgresql-18.3.tar.bz2
+postgresql-16.14.tar.bz2
+postgresql-18.4.tar.bz2
 postgresql-setup-8.9.tar.gz
diff --git a/1000-Replace-upstream-reference.patch b/1000-Replace-upstream-reference.patch
new file mode 100644
index 0000000..ae99dc4
--- /dev/null
+++ b/1000-Replace-upstream-reference.patch
@@ -0,0 +1,24 @@
+From eabfc409e6c79367567d465fec270b30c52a683f Mon Feb 23 00:00:00 2001
+From: Akshata Konala <akshata.konala@oracle.com>
+Date: Mon, 23 Feb 2026 06:03:07 -0700
+Subject: [PATCH] Replace upstream reference
+Signed-off-by: Akshata Konala <akshata.konala@oracle.com>
+---
+ postgresql-setup-8.9/bin/postgresql-setup.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/postgresql-setup-8.9/bin/postgresql-setup.in b/postgresql-setup-8.9/bin/postgresql-setup.in
+index cf9ed24..cfa3e1e 100644
+--- a/postgresql-setup-8.9/bin/postgresql-setup.in
++++ b/postgresql-setup-8.9/bin/postgresql-setup.in
+@@ -287,7 +287,7 @@ upgrade()
+     }
+ 
+     test x"$upgradefrom_redhat_sockets_hack" = xyes && {
+-        debug "upgrading from redhat server"
++        debug "upgrading from OL server"
+         socket_hacks="export REDHAT_PGUPGRADE_FROM_RHEL=yes"
+     }
+ 
+-- 
+2.31.1
diff --git a/postgresql-16.13.tar.bz2.sha256 b/postgresql-16.13.tar.bz2.sha256
deleted file mode 100644
index 017f6bc..0000000
--- a/postgresql-16.13.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-dc2ddbbd245c0265a689408e3d2f2f3f9ba2da96bd19318214b313cdd9797287  postgresql-16.13.tar.bz2
diff --git a/postgresql-16.14.tar.bz2.sha256 b/postgresql-16.14.tar.bz2.sha256
new file mode 100644
index 0000000..35d546d
--- /dev/null
+++ b/postgresql-16.14.tar.bz2.sha256
@@ -0,0 +1 @@
+f6d077142737920858ce958ccdb75c6ee137a63b5b0853c70693d401ac7e3471  postgresql-16.14.tar.bz2
diff --git a/postgresql-18.3.tar.bz2.sha256 b/postgresql-18.3.tar.bz2.sha256
deleted file mode 100644
index 44943e1..0000000
--- a/postgresql-18.3.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-d95663fbbf3a80f81a9d98d895266bdcb74ba274bcc04ef6d76630a72dee016f  postgresql-18.3.tar.bz2
diff --git a/postgresql-18.4.tar.bz2.sha256 b/postgresql-18.4.tar.bz2.sha256
new file mode 100644
index 0000000..24712a0
--- /dev/null
+++ b/postgresql-18.4.tar.bz2.sha256
@@ -0,0 +1 @@
+81a81ec695fb0c7901407defaa1d2f7973617154cf27ba74e3a7ab8e64436094  postgresql-18.4.tar.bz2
diff --git a/postgresql18.spec b/postgresql18.spec
index 6507324..4683832 100644
--- a/postgresql18.spec
+++ b/postgresql18.spec
@@ -47,8 +47,8 @@
 
 Summary: PostgreSQL client programs
 Name: %{majorname}%{majorversion}
-Version: 18.3
-Release: 1%{?dist}
+Version: 18.4
+Release: 1.0.1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -60,7 +60,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
 
@@ -95,6 +95,8 @@ Patch9: postgresql-server-pg_config.patch
 # rhbz#1940964
 Patch10: postgresql-datalayout-mismatch-on-s390.patch
 Patch12: postgresql-no-libecpg.patch
+# Oracle Patches
+Patch1000: 1000-Replace-upstream-reference.patch
 
 # This macro is used for package names in the files section
 %if %?postgresql_default
@@ -520,6 +522,7 @@ goal of accelerating analytics queries.
 %endif
 %patch 9 -p1
 %patch 10 -p1
+%patch 1000 -p1
 
 
 %if ! %external_libpq
@@ -1365,6 +1368,13 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Fri Jul 17 2026 EL Errata <el-errata_ww@oracle.com> - 18.4-1.0.1
+- Replace upstream reference
+
+* Wed May 28 2026 Filip Janus <fjanus@redhat.com> - 18.4-1
+- Update to 18.4
+- Fix CVE-2026-6478
+
 * Fri Feb 27 2026 Filip Janus <fjanus@redhat.com> - 18.3-1
 - Update to 18.3
 - Enable pltcl
diff --git a/sources b/sources
index 2420311..fcf5058 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (postgresql-16.13.tar.bz2) = 3ea11b81ce55be5c3c169f0c94ddfa9debae6b3cbe7407086ba3a602fad7668900c2838d4d4488c671b2ccc670a9cd288ece90e42ecf8de953df6b4e103d286d
-SHA512 (postgresql-18.3.tar.bz2) = fdbe6d726f46738cf14acab96e5c05f7d65aefe78563281b416bb14a27c7c42e4df921e26b32816a5030ddbe506b95767e2c74a35afc589916504df38d1cb11c
+SHA512 (postgresql-16.14.tar.bz2) = ba2f943aa29a9473986aedd617b5884f61a4f28984e807b1f5cb4a7bd82f62856419b23bd020cbdeb4e572b4cabe8038a6dc9fd83e2a4cbccc9c11872504d210
+SHA512 (postgresql-18.4.tar.bz2) = 1a7606b5b2460a4fc817d491e1e03262df17ece6869fa3d2b80647baffcfb790fbcfa019c3b10fab9f9a14218651b6a358864e40a5d8c5ddc796db2d6e5b469c
 SHA512 (postgresql-setup-8.9.tar.gz) = 118e9ebf858722a38b0e90324bc1b49fc7058cda601ca0a7e78c94e7b95e89d6dbbc46f377626364b068614ced3cde3cb4733973ad2d71bf17892ad773657ef7