diff --git a/Cargo.lock b/Cargo.lock
index 1ee4b42ccb..f0a37f9761 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -792,7 +792,7 @@ dependencies = [
 
 [[package]]
 name = "libsignal-ffi"
-version = "0.5.1"
+version = "0.5.2"
 dependencies = [
  "async-trait",
  "device-transfer",
@@ -807,7 +807,7 @@ dependencies = [
 
 [[package]]
 name = "libsignal-jni"
-version = "0.5.1"
+version = "0.5.2"
 dependencies = [
  "async-trait",
  "jni",
@@ -821,7 +821,7 @@ dependencies = [
 
 [[package]]
 name = "libsignal-node"
-version = "0.5.1"
+version = "0.5.2"
 dependencies = [
  "async-trait",
  "libsignal-bridge",
@@ -942,9 +942,8 @@ checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333"
 
 [[package]]
 name = "neon"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcdbfbcfbb5ae2ffc7281dfe0b118374bd696369096afc252f26c0b8e7a02e91"
+version = "0.8.2"
+source = "git+https://github.com/signalapp/neon?tag=signal-2021-05-19#b30d2919fba913b35d0866712327ace5b7fff6b1"
 dependencies = [
  "cslice",
  "neon-build",
@@ -956,15 +955,13 @@ dependencies = [
 
 [[package]]
 name = "neon-build"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a529aacddb4b04e9c0a0d5e67478d9aad331c748cbbf6d1657f6d167b3fac37a"
+version = "0.8.2"
+source = "git+https://github.com/signalapp/neon?tag=signal-2021-05-19#b30d2919fba913b35d0866712327ace5b7fff6b1"
 
 [[package]]
 name = "neon-macros"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cfecd558575c3997790d574be135680e5cd8d75dcd3e82fe4e71fb6fa4c1b71"
+version = "0.8.2"
+source = "git+https://github.com/signalapp/neon?tag=signal-2021-05-19#b30d2919fba913b35d0866712327ace5b7fff6b1"
 dependencies = [
  "quote",
  "syn",
@@ -972,9 +969,8 @@ dependencies = [
 
 [[package]]
 name = "neon-runtime"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dbec080794ea0939cbd4fa262e749068fd36b18bbb65b6b810e72ae98fea789"
+version = "0.8.2"
+source = "git+https://github.com/signalapp/neon?tag=signal-2021-05-19#b30d2919fba913b35d0866712327ace5b7fff6b1"
 dependencies = [
  "cfg-if 1.0.0",
  "libloading",
diff --git a/Cargo.toml b/Cargo.toml
index d5af71a2a5..74c4bc89f8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,6 +17,7 @@ default-members = [
 
 [patch.crates-io]
 curve25519-dalek = { git = 'https://github.com/signalapp/curve25519-dalek', branch = '3.0.0-lizard2' }
+neon = { git = 'https://github.com/signalapp/neon', tag = 'signal-2021-05-19' }
 
 [profile.dev.package.num-bigint-dig]
 opt-level = 2 # too slow otherwise!
diff --git a/SignalClient.podspec b/SignalClient.podspec
index 19312388e1..9870000f21 100644
--- a/SignalClient.podspec
+++ b/SignalClient.podspec
@@ -5,7 +5,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SignalClient'
-  s.version          = '0.5.1'
+  s.version          = '0.5.2'
   s.summary          = 'A Swift wrapper library for communicating with the Signal messaging service.'
 
   s.homepage         = 'https://github.com/signalapp/libsignal-client'
diff --git a/java/build.gradle b/java/build.gradle
index a88e3741c3..a54f4eb40c 100644
--- a/java/build.gradle
+++ b/java/build.gradle
@@ -1,5 +1,5 @@
 subprojects {
-    ext.version_number     = "0.5.1"
+    ext.version_number     = "0.5.2"
     ext.group_info         = "org.whispersystems"
 
     if (JavaVersion.current().isJava8Compatible()) {
diff --git a/package.json b/package.json
index 6e69281da4..d5bcab201f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@signalapp/signal-client",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "license": "AGPL-3.0-only",
   "main": "node/dist/index.js",
   "types": "node/dist/index.d.ts",
diff --git a/rust/bridge/ffi/Cargo.toml b/rust/bridge/ffi/Cargo.toml
index 8de687fa0f..ec16d5b5d7 100644
--- a/rust/bridge/ffi/Cargo.toml
+++ b/rust/bridge/ffi/Cargo.toml
@@ -5,7 +5,7 @@
 
 [package]
 name = "libsignal-ffi"
-version = "0.5.1"
+version = "0.5.2"
 authors = ["Jack Lloyd <jack@signal.org>"]
 edition = "2018"
 license = "AGPL-3.0-only"
diff --git a/rust/bridge/jni/Cargo.toml b/rust/bridge/jni/Cargo.toml
index 9702b79a0d..18d1b7d8a1 100644
--- a/rust/bridge/jni/Cargo.toml
+++ b/rust/bridge/jni/Cargo.toml
@@ -5,7 +5,7 @@
 
 [package]
 name = "libsignal-jni"
-version = "0.5.1"
+version = "0.5.2"
 authors = ["Jack Lloyd <jack@signal.org>"]
 edition = "2018"
 license = "AGPL-3.0-only"
diff --git a/rust/bridge/node/Cargo.toml b/rust/bridge/node/Cargo.toml
index 50f8d6b425..3035ecfdde 100644
--- a/rust/bridge/node/Cargo.toml
+++ b/rust/bridge/node/Cargo.toml
@@ -5,7 +5,7 @@
 
 [package]
 name = "libsignal-node"
-version = "0.5.1"
+version = "0.5.2"
 authors = ["Jordan Rose <jrose@signal.org>", "Jack Lloyd <jack@signal.org>"]
 license = "AGPL-3.0-only"
 edition = "2018"
@@ -18,7 +18,7 @@ crate-type = ["cdylib"]
 libsignal-protocol = { path = "../../protocol" }
 libsignal-bridge = { path = "../shared", features = ["node"] }
 signal-neon-futures = { path = "futures" }
-neon = { version = "0.8", default-features = false, features = ["napi-4", "event-queue-api"] }
+neon = { version = "0.8", default-features = false, features = ["napi-6", "event-queue-api"] }
 rand = "0.7.3"
 log = "0.4"
 log-panics = { version = "2.0.0", features = ["with-backtrace"] }
diff --git a/rust/bridge/shared/Cargo.toml b/rust/bridge/shared/Cargo.toml
index f713e55d5b..4cebf04086 100644
--- a/rust/bridge/shared/Cargo.toml
+++ b/rust/bridge/shared/Cargo.toml
@@ -26,7 +26,7 @@ uuid = "0.8"
 
 libc = { version = "0.2", optional = true }
 jni_crate = { version = "0.19", package = "jni", optional = true }
-neon = { version = "0.8", optional = true, default-features = false, features = ["napi-4"] }
+neon = { version = "0.8", optional = true, default-features = false, features = ["napi-6"] }
 linkme = { version = "0.2.4", optional = true }
 signal-neon-futures = { path = "../node/futures", optional = true }