diff --git a/Ghidra/Features/BSim/Module.manifest b/Ghidra/Features/BSim/Module.manifest
index f61ef6b59e..a98c965931 100755
--- a/Ghidra/Features/BSim/Module.manifest
+++ b/Ghidra/Features/BSim/Module.manifest
@@ -1,7 +1,7 @@
 ##MODULE IP: Oxygen Icons - LGPL 3.0
-MODULE FILE LICENSE: postgresql-15.13.tar.gz Postgresql License
+MODULE FILE LICENSE: postgresql-15.18.tar.gz Postgresql License
 MODULE FILE LICENSE: lib/postgresql-42.7.13.jar PostgresqlJDBC License
 MODULE FILE LICENSE: lib/commons-dbcp2-2.9.0.jar Apache License 2.0
 MODULE FILE LICENSE: lib/commons-pool2-2.11.1.jar Apache License 2.0
 MODULE FILE LICENSE: lib/commons-logging-1.2.jar Apache License 2.0
-MODULE FILE LICENSE: lib/h2-2.2.220.jar H2 Mozilla License 2.0
\ No newline at end of file
+MODULE FILE LICENSE: lib/h2-2.2.220.jar H2 Mozilla License 2.0
diff --git a/Ghidra/Features/BSim/build.gradle b/Ghidra/Features/BSim/build.gradle
index 660f26cb0e..15bd8ff811 100755
--- a/Ghidra/Features/BSim/build.gradle
+++ b/Ghidra/Features/BSim/build.gradle
@@ -26,7 +26,7 @@ eclipse.project.name = 'Features BSim'
 import java.nio.file.Files
 
 // NOTE: fetchDependencies.gradle must be updated if postgresql version changes
-def postgresql_distro = "postgresql-15.13.tar.gz"
+def postgresql_distro = "postgresql-15.18.tar.gz"
 
 dependencies {
 	api project(":Decompiler")
diff --git a/Ghidra/Features/BSim/support/make-postgres.sh b/Ghidra/Features/BSim/support/make-postgres.sh
index 5ab6cec265..d20c35dd6d 100755
--- a/Ghidra/Features/BSim/support/make-postgres.sh
+++ b/Ghidra/Features/BSim/support/make-postgres.sh
@@ -18,11 +18,11 @@
 # This script builds the postgresql server and BSim extension within a
 # GHIDRA installation.
 #
-# The PostgreSQL source distribution file postgresql-15.13.tar.gz must
+# The PostgreSQL source distribution file postgresql-15.18.tar.gz must
 # be placed in the BSim module directory prior to running this script.
 # This file can be downloaded directly from the PostgreSQL website at:
 #
-#   https://www.postgresql.org/ftp/source/v15.13
+#   https://www.postgresql.org/ftp/source/v15.18
 #
 # Within development environments, this script will first check the
 # ghidra.bin repo for this source file.
@@ -46,7 +46,7 @@
 #
 #
 
-POSTGRES=postgresql-15.13
+POSTGRES=postgresql-15.18
 POSTGRES_GZ=${POSTGRES}.tar.gz
 POSTGRES_CONFIG_OPTIONS="--disable-rpath --with-openssl"
 
diff --git a/gradle/support/fetchDependencies.gradle b/gradle/support/fetchDependencies.gradle
index 322b2c9b15..54d4560a6c 100644
--- a/gradle/support/fetchDependencies.gradle
+++ b/gradle/support/fetchDependencies.gradle
@@ -96,9 +96,9 @@ ext.deps = [
 		destination: file("${DEPS_DIR}/GhidraServer")
 	],
 	[
-		name: "postgresql-15.13.tar.gz",
-		url: "https://ftp.postgresql.org/pub/source/v15.13/postgresql-15.13.tar.gz",
-		sha256: "afdc22b0a6e5bec7b65723756b90d44ea911e61b2f7b01c4dc5524ab813b4d89",
+		name: "postgresql-15.18.tar.gz",
+		url: "https://ftp.postgresql.org/pub/source/v15.18/postgresql-15.18.tar.gz",
+		sha256: "d32a533516edc688ebbb96ae221b605be2712edd94d7428b42a4af5644250943",
 		destination: file("${DEPS_DIR}/BSim")
 	],
 	[