diff --git a/Cargo.lock b/Cargo.lock
index 7ea63d9..2620caa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,22 +4,20 @@ version = 3
 
 [[package]]
 name = "aes"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
+version = "0.9.0-pre"
+source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo/bump-cipher/0.5.0-pre.3#bbc6d549f5abff8ce5301abf1f97d9c494ada85c"
 dependencies = [
  "cfg-if",
- "cipher 0.4.4",
+ "cipher",
  "cpufeatures",
 ]
 
 [[package]]
 name = "belt-block"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9aa1eef3994e2ccd304a78fe3fea4a73e5792007f85f09b79bb82143ca5f82b"
+version = "0.2.0-pre"
+source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo/bump-cipher/0.5.0-pre.3#bbc6d549f5abff8ce5301abf1f97d9c494ada85c"
 dependencies = [
- "cipher 0.4.4",
+ "cipher",
 ]
 
 [[package]]
@@ -27,7 +25,7 @@ name = "belt-ctr"
 version = "0.1.0"
 dependencies = [
  "belt-block",
- "cipher 0.5.0-pre.3",
+ "cipher",
  "hex-literal 0.4.1",
 ]
 
@@ -51,7 +49,7 @@ name = "cbc"
 version = "0.1.2"
 dependencies = [
  "aes",
- "cipher 0.5.0-pre.3",
+ "cipher",
  "hex-literal 0.3.4",
 ]
 
@@ -61,7 +59,7 @@ version = "0.8.2"
 dependencies = [
  "aes",
  "belt-block",
- "cipher 0.5.0-pre.3",
+ "cipher",
  "hex-literal 0.3.4",
 ]
 
@@ -70,7 +68,7 @@ name = "cfb8"
 version = "0.8.1"
 dependencies = [
  "aes",
- "cipher 0.5.0-pre.3",
+ "cipher",
  "hex-literal 0.3.4",
 ]
 
@@ -80,25 +78,13 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "cipher"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common 0.1.6",
- "inout 0.1.3",
-]
-
 [[package]]
 name = "cipher"
 version = "0.5.0-pre.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4edc902a09138d9a0d02800f2c214f15295555e4d126bf4b312ea6f3bce7ae46"
 dependencies = [
  "blobby",
- "crypto-common 0.2.0-pre.5",
- "inout 0.2.0-pre.4",
+ "crypto-common",
+ "inout",
  "zeroize",
 ]
 
@@ -111,16 +97,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
 [[package]]
 name = "crypto-common"
 version = "0.2.0-pre.5"
@@ -137,22 +113,12 @@ name = "ctr"
 version = "0.9.2"
 dependencies = [
  "aes",
- "cipher 0.5.0-pre.3",
+ "cipher",
  "hex-literal 0.3.4",
  "kuznyechik",
  "magma",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.12"
@@ -190,19 +156,10 @@ name = "ige"
 version = "0.1.1"
 dependencies = [
  "aes",
- "cipher 0.5.0-pre.3",
+ "cipher",
  "hex-literal 0.3.4",
 ]
 
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "inout"
 version = "0.2.0-pre.4"
@@ -215,11 +172,10 @@ dependencies = [
 
 [[package]]
 name = "kuznyechik"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca7899a524198c60ded686fc826703de2a04470aff9d042e8cc1f845b912c12f"
+version = "0.9.0-pre"
+source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo/bump-cipher/0.5.0-pre.3#bbc6d549f5abff8ce5301abf1f97d9c494ada85c"
 dependencies = [
- "cipher 0.4.4",
+ "cipher",
 ]
 
 [[package]]
@@ -230,11 +186,10 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "magma"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b09bd24ba5fcb427ee21a09e28f9a5e2c2fce78c69af974fb8d373662ceedb4"
+version = "0.10.0-pre"
+source = "git+https://github.com/baloo/block-ciphers.git?branch=baloo/bump-cipher/0.5.0-pre.3#bbc6d549f5abff8ce5301abf1f97d9c494ada85c"
 dependencies = [
- "cipher 0.4.4",
+ "cipher",
 ]
 
 [[package]]
@@ -242,7 +197,7 @@ name = "ofb"
 version = "0.6.1"
 dependencies = [
  "aes",
- "cipher 0.5.0-pre.3",
+ "cipher",
  "hex-literal 0.3.4",
 ]
 
@@ -251,7 +206,7 @@ name = "pcbc"
 version = "0.1.2"
 dependencies = [
  "aes",
- "cipher 0.5.0-pre.3",
+ "cipher",
  "hex-literal 0.3.4",
 ]
 
@@ -270,12 +225,6 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
diff --git a/Cargo.toml b/Cargo.toml
index 1d90026..1c33adc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,3 +9,13 @@ members = [
     "ofb",
     "pcbc",
 ]
+
+[patch.crates-io]
+# https://github.com/RustCrypto/block-ciphers/pull/411
+aes        = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/bump-cipher/0.5.0-pre.3" }
+belt-block = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/bump-cipher/0.5.0-pre.3" }
+kuznyechik = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/bump-cipher/0.5.0-pre.3" }
+magma      = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/bump-cipher/0.5.0-pre.3" }
+
+# https://github.com/RustCrypto/traits/pull/1512
+cipher     = { git = "https://github.com/baloo/traits.git", branch = "baloo/cipher/block_bench" }
diff --git a/belt-ctr/Cargo.toml b/belt-ctr/Cargo.toml
index 9786580..d2888bb 100644
--- a/belt-ctr/Cargo.toml
+++ b/belt-ctr/Cargo.toml
@@ -14,11 +14,11 @@ categories = ["cryptography", "no-std"]
 
 [dependencies]
 cipher = "=0.5.0-pre.3"
-belt-block = "0.1"
+belt-block = "=0.2.0-pre"
 
 [dev-dependencies]
 hex-literal = "0.4"
-belt-block = "0.1"
+belt-block = "=0.2.0-pre"
 cipher = { version = "=0.5.0-pre.3", features = ["dev"] }
 
 [features]
diff --git a/cbc/Cargo.toml b/cbc/Cargo.toml
index 32d9c56..471a80c 100644
--- a/cbc/Cargo.toml
+++ b/cbc/Cargo.toml
@@ -16,7 +16,7 @@ categories = ["cryptography", "no-std"]
 cipher = "=0.5.0-pre.3"
 
 [dev-dependencies]
-aes = "0.8"
+aes = "=0.9.0-pre"
 cipher = { version = "=0.5.0-pre.3", features = ["dev"] }
 hex-literal = "0.3.3"
 
diff --git a/cfb-mode/Cargo.toml b/cfb-mode/Cargo.toml
index 86a0197..02cad1d 100644
--- a/cfb-mode/Cargo.toml
+++ b/cfb-mode/Cargo.toml
@@ -16,8 +16,8 @@ categories = ["cryptography", "no-std"]
 cipher = "=0.5.0-pre.3"
 
 [dev-dependencies]
-aes = "0.8"
-belt-block = "0.1"
+aes = "=0.9.0-pre"
+belt-block = "=0.2.0-pre"
 cipher = { version = "=0.5.0-pre.3", features = ["dev"] }
 hex-literal = "0.3"
 
diff --git a/cfb8/Cargo.toml b/cfb8/Cargo.toml
index 41623ce..8aa4652 100644
--- a/cfb8/Cargo.toml
+++ b/cfb8/Cargo.toml
@@ -16,7 +16,7 @@ categories = ["cryptography", "no-std"]
 cipher = "=0.5.0-pre.3"
 
 [dev-dependencies]
-aes = "0.8"
+aes = "=0.9.0-pre"
 cipher = { version = "=0.5.0-pre.3", features = ["dev"] }
 hex-literal = "0.3"
 
diff --git a/ctr/Cargo.toml b/ctr/Cargo.toml
index 8fdd20a..8c093ea 100644
--- a/ctr/Cargo.toml
+++ b/ctr/Cargo.toml
@@ -16,9 +16,9 @@ categories = ["cryptography", "no-std"]
 cipher = "=0.5.0-pre.3"
 
 [dev-dependencies]
-aes = "0.8"
-magma = "0.9"
-kuznyechik = "0.8"
+aes = "=0.9.0-pre"
+magma = "=0.10.0-pre"
+kuznyechik = "=0.9.0-pre"
 cipher = { version = "=0.5.0-pre.3", features = ["dev"] }
 hex-literal = "0.3.3"
 
diff --git a/ige/Cargo.toml b/ige/Cargo.toml
index b0942d1..3df4fcd 100644
--- a/ige/Cargo.toml
+++ b/ige/Cargo.toml
@@ -16,7 +16,7 @@ categories = ["cryptography", "no-std"]
 cipher = "=0.5.0-pre.3"
 
 [dev-dependencies]
-aes = "0.8"
+aes = "=0.9.0-pre"
 cipher = { version = "=0.5.0-pre.3", features = ["dev"] }
 hex-literal = "0.3.3"
 
diff --git a/ofb/Cargo.toml b/ofb/Cargo.toml
index b18aac1..6d3126b 100644
--- a/ofb/Cargo.toml
+++ b/ofb/Cargo.toml
@@ -16,7 +16,7 @@ categories = ["cryptography", "no-std"]
 cipher = "=0.5.0-pre.3"
 
 [dev-dependencies]
-aes = "0.8"
+aes = "=0.9.0-pre"
 cipher = { version = "=0.5.0-pre.3", features = ["dev"] }
 hex-literal = "0.3"
 
diff --git a/pcbc/Cargo.toml b/pcbc/Cargo.toml
index bbdbec2..f0ab1a6 100644
--- a/pcbc/Cargo.toml
+++ b/pcbc/Cargo.toml
@@ -16,7 +16,7 @@ categories = ["cryptography", "no-std"]
 cipher = "=0.5.0-pre.3"
 
 [dev-dependencies]
-aes = "0.8"
+aes = "=0.9.0-pre"
 cipher = { version = "=0.5.0-pre.3", features = ["dev"] }
 hex-literal = "0.3.3"