diff --git a/Cargo.lock b/Cargo.lock
index 9e309db6e907..752a662bdb46 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3160,7 +3160,7 @@ dependencies = [
 
 [[package]]
 name = "shadowsocks"
-version = "1.20.1"
+version = "1.20.2"
 dependencies = [
  "aes",
  "arc-swap",
@@ -3226,7 +3226,7 @@ dependencies = [
 
 [[package]]
 name = "shadowsocks-rust"
-version = "1.20.3"
+version = "1.20.4"
 dependencies = [
  "base64 0.22.1",
  "build-time",
@@ -3267,7 +3267,7 @@ dependencies = [
 
 [[package]]
 name = "shadowsocks-service"
-version = "1.20.3"
+version = "1.20.4"
 dependencies = [
  "arc-swap",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index 425f98c09836..b81b29d02d87 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shadowsocks-rust"
-version = "1.20.3"
+version = "1.20.4"
 authors = ["Shadowsocks Contributors"]
 description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls."
 repository = "https://github.com/shadowsocks/shadowsocks-rust"
@@ -248,7 +248,7 @@ jemallocator = { version = "0.5", optional = true }
 snmalloc-rs = { version = "0.3", optional = true }
 rpmalloc = { version = "0.2", optional = true }
 
-shadowsocks-service = { version = "1.20.3", path = "./crates/shadowsocks-service" }
+shadowsocks-service = { version = "1.20.4", path = "./crates/shadowsocks-service" }
 
 windows-service = { version = "0.7", optional = true }
 
diff --git a/crates/shadowsocks-service/Cargo.toml b/crates/shadowsocks-service/Cargo.toml
index b6cdf2ff04be..e69351366ab5 100644
--- a/crates/shadowsocks-service/Cargo.toml
+++ b/crates/shadowsocks-service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shadowsocks-service"
-version = "1.20.3"
+version = "1.20.4"
 authors = ["Shadowsocks Contributors"]
 description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls."
 repository = "https://github.com/shadowsocks/shadowsocks-rust"
@@ -205,7 +205,7 @@ serde = { version = "1.0", features = ["derive"] }
 json5 = "0.4"
 bson = { version = "2.10.0", optional = true }
 
-shadowsocks = { version = "1.20.1", path = "../shadowsocks", default-features = false }
+shadowsocks = { version = "1.20.2", path = "../shadowsocks", default-features = false }
 
 # Just for the ioctl call macro
 [target.'cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd"))'.dependencies]
diff --git a/crates/shadowsocks/Cargo.toml b/crates/shadowsocks/Cargo.toml
index 0cd60e2825cc..f752f82b1182 100644
--- a/crates/shadowsocks/Cargo.toml
+++ b/crates/shadowsocks/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shadowsocks"
-version = "1.20.1"
+version = "1.20.2"
 authors = ["Shadowsocks Contributors"]
 description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls."
 repository = "https://github.com/shadowsocks/shadowsocks-rust"
diff --git a/debian/changelog b/debian/changelog
index f0c7fac109c7..adbcd06a0ffb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+shadowsocks-rust (1.20.4) unstable; urgency=medium
+
+  ## Features
+
+  - #1616 `local`: Allow configuring SOCKS5 `UDP_ASSOCIATE` address
+  - #1607 Published in MacPorts: https://ports.macports.org/port/shadowsocks-rust/
+  - #1613 `ProxyServerStream::from_stream` made public
+
+  ## Bug Fixes
+
+  - #1612 `server`: Properly exit server instance if any of the sub-tasks exited
+
 shadowsocks-rust (1.20.3) unstable; urgency=medium
 
   ## Features