diff --git a/Cargo.lock b/Cargo.lock
index 48cacb3fb..4dd421490 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -149,16 +149,15 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "0.1.2"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90f47c78ea98277cb1f5e6f60ba4fc762f5eafe9f6511bc2f7dfd8b75c225650"
+checksum = "a831e74aa1937d3bbd3a356f34c23dbc6b6f0abc5160bd5484a9f75d5e76aea8"
 dependencies = [
- "async-io",
- "futures-lite",
- "multitask",
- "parking 1.0.6",
- "scoped-tls",
- "waker-fn",
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite 1.4.0",
+ "once_cell",
 ]
 
 [[package]]
@@ -201,19 +200,22 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "0.1.11"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae22a338d28c75b53702b66f77979062cb29675db376d99e451af4fa79dedb3"
+checksum = "38628c78a34f111c5a6b98fc87dfc056cd1590b61afe748b145be4623c56d194"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "futures-lite",
+ "fastrand",
+ "futures-lite 1.4.0",
  "libc",
+ "log",
  "once_cell",
  "parking 2.0.0",
  "polling",
  "socket2",
  "vec-arena",
+ "waker-fn",
  "wepoll-sys-stjepang",
  "winapi",
 ]
@@ -264,21 +266,20 @@ dependencies = [
 [[package]]
 name = "async-std"
 version = "1.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c8da367da62b8ff2313c406c9ac091c1b31d67a165becdd2de380d846260f7"
+source = "git+https://github.com/async-rs/async-std#e9cb238f49b6097c3dc3d6f06a6a54f22dc955d4"
 dependencies = [
  "async-attributes",
  "async-executor",
  "async-io",
  "async-mutex",
  "async-task",
- "blocking 0.5.2",
+ "blocking 1.0.0",
  "crossbeam-utils",
  "futures-channel",
  "futures-core",
  "futures-io",
- "futures-lite",
- "futures-timer",
+ "futures-lite 1.4.0",
+ "gloo-timers",
  "kv-log-macro",
  "log",
  "memchr",
@@ -493,7 +494,7 @@ checksum = "d2468ff7bf85066b4a3678fede6fe66db31846d753ff0adfbfab2c6a6e81612b"
 dependencies = [
  "async-channel",
  "atomic-waker",
- "futures-lite",
+ "futures-lite 0.1.11",
  "once_cell",
  "parking 1.0.6",
  "waker-fn",
@@ -501,13 +502,14 @@ dependencies = [
 
 [[package]]
 name = "blocking"
-version = "0.5.2"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea5800d29218fea137b0880387e5948694a23c93fcdde157006966693a865c7c"
+checksum = "2640778f8053e72c11f621b0a5175a0560a269282aa98ed85107773ab8e2a556"
 dependencies = [
  "async-channel",
  "atomic-waker",
- "futures-lite",
+ "fastrand",
+ "futures-lite 1.4.0",
  "once_cell",
  "waker-fn",
 ]
@@ -1388,6 +1390,21 @@ dependencies = [
  "waker-fn",
 ]
 
+[[package]]
+name = "futures-lite"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba659a67bd5ac00896b31e1f4095174134a31e448893d73256f1d51b81abbd62"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "parking 2.0.0",
+ "pin-project-lite",
+ "waker-fn",
+]
+
 [[package]]
 name = "futures-macro"
 version = "0.3.5"
@@ -1415,16 +1432,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "futures-timer"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
-dependencies = [
- "gloo-timers",
- "send_wrapper",
-]
-
 [[package]]
 name = "futures-util"
 version = "0.3.5"
@@ -1984,17 +1991,6 @@ dependencies = [
  "autocfg 1.0.1",
 ]
 
-[[package]]
-name = "multitask"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c09c35271e7dcdb5f709779111f2c8e8ab8e06c1b587c1c6a9e179d865aaa5b4"
-dependencies = [
- "async-task",
- "concurrent-queue",
- "fastrand",
-]
-
 [[package]]
 name = "mutate_once"
 version = "0.1.1"
@@ -2395,8 +2391,8 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "0.1.9"
-source = "git+https://github.com/oblique/polling#0b7ee78833745f534aa073ef48607ae03daa66cb"
+version = "1.0.1"
+source = "git+https://github.com/oblique/polling#f7f67e87456763c9569fa0568db422cab1ad6770"
 dependencies = [
  "cfg-if",
  "libc",
@@ -2857,12 +2853,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
-[[package]]
-name = "send_wrapper"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
-
 [[package]]
 name = "serde"
 version = "1.0.116"
@@ -3171,9 +3161,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.40"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350"
+checksum = "6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3474,9 +3464,9 @@ checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
 
 [[package]]
 name = "vec-arena"
-version = "0.5.2"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cb18268690309760d59ee1a9b21132c126ba384f374c59a94db4bc03adeb561"
+checksum = "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d"
 
 [[package]]
 name = "version_check"
@@ -3601,9 +3591,9 @@ dependencies = [
 
 [[package]]
 name = "wepoll-sys-stjepang"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd319e971980166b53e17b1026812ad66c6b54063be879eb182342b55284694"
+checksum = "1fdfbb03f290ca0b27922e8d48a0997b4ceea12df33269b9f75e713311eb178d"
 dependencies = [
  "cc",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 2b2421b8f..945863bcf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -103,4 +103,5 @@ vendored = ["async-native-tls/vendored", "async-smtp/native-tls-vendored"]
 nightly = ["pgp/nightly"]
 
 [patch.crates-io]
-polling = { git = "https://github.com/oblique/polling", branch = "master"}
\ No newline at end of file
+polling = { git = "https://github.com/oblique/polling", branch = "master"}
+async-std = { git = "https://github.com/async-rs/async-std", branch = "master"}
\ No newline at end of file