diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl
index 86393bd..87f1b16 100644
--- a/build/docker-bake.hcl
+++ b/build/docker-bake.hcl
@@ -1,5 +1,5 @@
 group "default" {
-  targets = ["5.3.0", "5.3.1", "5.3.2", "5.4.0", "5.4.1", "5.4.2", "5.5.1", "5.5.3", "5.6.0", "5.6.1", "5.6.2", "5.7.0", "5.7.1", "5.7.2", "5.8.0", "5.8.1"]
+  targets = ["5.3.0", "5.3.1", "5.3.2", "5.4.0", "5.4.1", "5.4.2", "5.5.1", "5.5.3", "5.6.0", "5.6.1", "5.6.2", "5.7.0", "5.7.1", "5.7.2", "5.8.0", "5.8.1", "5.8.2"]
 }
 
 target "build-dockerfile" {
@@ -141,3 +141,11 @@ target "5.8.1" {
     WP_VERSION = "5.8.1"
   }
 }
+
+target "5.8.2" {
+  inherits = ["build-dockerfile", "build-platforms", "build-common"]
+  tags     = ["docker.io/nlss/wordpress:5.8.2", "docker.io/nlss/wordpress:latest"]
+  args = {
+    WP_VERSION = "5.8.2"
+  }
+}
diff --git a/patches/5.8.2/wp-admin-update-core.patch b/patches/5.8.2/wp-admin-update-core.patch
new file mode 100644
index 0000000..2111ade
--- /dev/null
+++ b/patches/5.8.2/wp-admin-update-core.patch
@@ -0,0 +1,14 @@
+--- update-core.php	2021-11-19 00:50:13.053965611 +0100
++++ update-core.php	2021-11-19 00:51:23.030501647 +0100
+@@ -1086,6 +1086,11 @@
+ 		wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+ 	}
+ 
++	wp_die(
++		__( 'Sorry, you are not allowed to update this site.' ) .
++		' Click <a href="https://github.com/N0rthernL1ghts/wordpress/wiki/WordPress-Core-Updates">here</a> to learn why.'
++	);
++
+ 	check_admin_referer( 'upgrade-core' );
+ 
+ 	// Do the (un)dismiss actions before headers, so that they can redirect.