diff --git a/Cargo.toml b/Cargo.toml
index 36b2c5dea..dc05008e8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -78,8 +78,7 @@ openssl = { version="0.10", optional = true }
 tokio-openssl = { version="0.2", optional = true }
 
 [dependencies.actix]
-#version = "0.5"
-git = "https://github.com/actix/actix.git"
+version = "0.5"
 
 [dev-dependencies]
 env_logger = "0.5"
diff --git a/examples/basics/Cargo.toml b/examples/basics/Cargo.toml
index 1df0f87d9..76bfa52be 100644
--- a/examples/basics/Cargo.toml
+++ b/examples/basics/Cargo.toml
@@ -7,5 +7,5 @@ workspace = "../.."
 [dependencies]
 futures = "*"
 env_logger = "0.5"
-actix = { git = "https://github.com/actix/actix.git" }
+actix = "0.5"
 actix-web = { path="../.." }
diff --git a/examples/diesel/Cargo.toml b/examples/diesel/Cargo.toml
index 8d9cf9e09..20c9b75c9 100644
--- a/examples/diesel/Cargo.toml
+++ b/examples/diesel/Cargo.toml
@@ -6,7 +6,7 @@ workspace = "../.."
 
 [dependencies]
 env_logger = "0.5"
-actix = { git = "https://github.com/actix/actix.git/" }
+actix = "0.5"
 actix-web = { path = "../../" }
 
 futures = "0.1"
diff --git a/examples/hello-world/Cargo.toml b/examples/hello-world/Cargo.toml
index 1526542ff..156a1ada6 100644
--- a/examples/hello-world/Cargo.toml
+++ b/examples/hello-world/Cargo.toml
@@ -6,5 +6,5 @@ workspace = "../.."
 
 [dependencies]
 env_logger = "0.5"
-actix = { git = "https://github.com/actix/actix.git" }
+actix = "0.5"
 actix-web = { path = "../../" }
diff --git a/examples/json/Cargo.toml b/examples/json/Cargo.toml
index d1a4f9a35..bf117c704 100644
--- a/examples/json/Cargo.toml
+++ b/examples/json/Cargo.toml
@@ -14,5 +14,5 @@ serde_json = "1.0"
 serde_derive = "1.0"
 json = "*"
 
-actix = { git = "https://github.com/actix/actix.git" }
+actix = "0.5"
 actix-web = { path="../../" }
diff --git a/examples/multipart/Cargo.toml b/examples/multipart/Cargo.toml
index 5fd17e4bc..b5235d7e7 100644
--- a/examples/multipart/Cargo.toml
+++ b/examples/multipart/Cargo.toml
@@ -11,5 +11,5 @@ path = "src/main.rs"
 [dependencies]
 env_logger = "*"
 futures = "0.1"
-actix = { git = "https://github.com/actix/actix.git" }
+actix = "0.5"
 actix-web = { path="../../" }
diff --git a/examples/r2d2/Cargo.toml b/examples/r2d2/Cargo.toml
index bb91b495c..ab9590a43 100644
--- a/examples/r2d2/Cargo.toml
+++ b/examples/r2d2/Cargo.toml
@@ -6,7 +6,7 @@ workspace = "../.."
 
 [dependencies]
 env_logger = "0.5"
-actix = { git = "https://github.com/actix/actix.git/" }
+actix = "0.5"
 actix-web = { path = "../../" }
 
 futures = "0.1"
diff --git a/examples/state/Cargo.toml b/examples/state/Cargo.toml
index e572cb0e8..bd3ba2439 100644
--- a/examples/state/Cargo.toml
+++ b/examples/state/Cargo.toml
@@ -7,6 +7,5 @@ workspace = "../.."
 [dependencies]
 futures = "*"
 env_logger = "0.5"
-#actix = "0.4.6"
-actix = {git = "https://github.com/actix/actix.git"}
+actix = "0.5"
 actix-web = { path = "../../" }
diff --git a/examples/template_tera/Cargo.toml b/examples/template_tera/Cargo.toml
index 400c367a8..8591fa50e 100644
--- a/examples/template_tera/Cargo.toml
+++ b/examples/template_tera/Cargo.toml
@@ -6,6 +6,6 @@ workspace = "../.."
 
 [dependencies]
 env_logger = "0.5"
-actix = "0.4"
+actix = "0.5"
 actix-web = { path = "../../" }
 tera = "*"
diff --git a/examples/tls/Cargo.toml b/examples/tls/Cargo.toml
index 71f8fae95..a4706d419 100644
--- a/examples/tls/Cargo.toml
+++ b/examples/tls/Cargo.toml
@@ -10,6 +10,6 @@ path = "src/main.rs"
 
 [dependencies]
 env_logger = "0.5"
-actix = { git = "https://github.com/actix/actix.git" }
+actix = "0.5"
 actix-web = { path = "../../", features=["alpn"] }
 openssl = { version="0.10" }
diff --git a/examples/web-cors/backend/Cargo.toml b/examples/web-cors/backend/Cargo.toml
index 31c3468cf..cffc895fa 100644
--- a/examples/web-cors/backend/Cargo.toml
+++ b/examples/web-cors/backend/Cargo.toml
@@ -10,7 +10,7 @@ serde_derive = "1.0"
 serde_json = "1.0"
 http = "0.1"
 
-actix = { git = "https://github.com/actix/actix.git" }
+actix = "0.5"
 actix-web = { path = "../../../" }
 dotenv = "0.10"
 env_logger = "0.5"
diff --git a/examples/websocket-chat/Cargo.toml b/examples/websocket-chat/Cargo.toml
index 5a9d7d3ac..389ccd346 100644
--- a/examples/websocket-chat/Cargo.toml
+++ b/examples/websocket-chat/Cargo.toml
@@ -25,5 +25,5 @@ serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
 
-actix = { git="https://github.com/actix/actix.git" }
+actix = "0.5"
 actix-web = { path="../../" }
diff --git a/examples/websocket/Cargo.toml b/examples/websocket/Cargo.toml
index 4b5de2cde..7b754f0d1 100644
--- a/examples/websocket/Cargo.toml
+++ b/examples/websocket/Cargo.toml
@@ -16,6 +16,5 @@ path = "src/client.rs"
 env_logger = "*"
 futures = "0.1"
 tokio-core = "0.1"
-#actix = "^0.4.6"
-actix = { git = "https://github.com/actix/actix.git" }
+actix = "0.5"
 actix-web = { path="../../" }
diff --git a/guide/src/qs_14.md b/guide/src/qs_14.md
index f29ce5634..749b74e7f 100644
--- a/guide/src/qs_14.md
+++ b/guide/src/qs_14.md
@@ -72,7 +72,7 @@ can access it.
 ```rust,ignore
 /// This is state where we will store *DbExecutor* address.
 struct State {
-    db: SyncAddress<DbExecutor>,
+    db: Addr<Syn, DbExecutor>,
 }
 
 fn main() {
@@ -106,7 +106,7 @@ fn index(req: HttpRequest<State>) -> Box<Future<Item=HttpResponse, Error=Error>>
     let name = &req.match_info()["name"];
 
     // Send message to `DbExecutor` actor
-    req.state().db.call_fut(CreateUser{name: name.to_owned()})
+    req.state().db.send(CreateUser{name: name.to_owned()})
         .from_err()
         .and_then(|res| {
             match res {