diff --git a/actix-server/CHANGES.md b/actix-server/CHANGES.md
index 067adcd6..fa205fec 100644
--- a/actix-server/CHANGES.md
+++ b/actix-server/CHANGES.md
@@ -1,5 +1,11 @@
 # Changes
 
+## Unreleased
+
+### Changed
+
+* workers(0) defaults to num_cpus::get()
+
 ## [1.0.3] - 2020-05-19
 
 ### Changed
diff --git a/actix-server/src/builder.rs b/actix-server/src/builder.rs
index 2e8ae30e..a29a59af 100644
--- a/actix-server/src/builder.rs
+++ b/actix-server/src/builder.rs
@@ -72,9 +72,12 @@ impl ServerBuilder {
     /// Set number of workers to start.
     ///
     /// By default server uses number of available logical cpu as workers
-    /// count.
+    /// count. Explicitly setting 0 will also default.
     pub fn workers(mut self, num: usize) -> Self {
-        self.threads = num;
+        self.threads = match num {
+            0 => num_cpus::get(),
+            _ => num,
+        };
         self
     }