diff --git a/lib/puma/cluster.rb b/lib/puma/cluster.rb
index c2eff7da..b14889e3 100644
--- a/lib/puma/cluster.rb
+++ b/lib/puma/cluster.rb
@@ -329,7 +329,8 @@ module Puma
 
       output_header "cluster"
 
-      log "* Process workers: #{@options[:workers]}"
+      # This is aligned with the output from Runner, see Runner#output_header
+      log "*      Workers: #{@options[:workers]}"
 
       # Threads explicitly marked as fork safe will be ignored.
       # Used in Rails, but may be used by anyone.
diff --git a/lib/puma/runner.rb b/lib/puma/runner.rb
index 84467cc6..615c62d8 100644
--- a/lib/puma/runner.rb
+++ b/lib/puma/runner.rb
@@ -85,11 +85,17 @@ module Puma
       min_t = @options[:min_threads]
       max_t = @options[:max_threads]
 
-      log "Puma starting in #{mode} mode...\n" \
-          "* Version #{Puma::Const::PUMA_VERSION} (#{ruby_engine}), codename: #{Puma::Const::CODE_NAME}\n" \
-          "* Min threads: #{min_t}, max threads: #{max_t}\n" \
-          "* Environment: #{ENV['RACK_ENV']}\n" \
-          "*         Pid: #{Process.pid}"
+      log "Puma starting in #{mode} mode..."
+      log "* Puma version: #{Puma::Const::PUMA_VERSION} (#{ruby_engine}) (\"#{Puma::Const::CODE_NAME}\")"
+      log "*  Min threads: #{min_t}"
+      log "*  Max threads: #{max_t}"
+      log "*  Environment: #{ENV['RACK_ENV']}"
+
+      if mode == "cluster"
+        log "*   Master PID: #{Process.pid}"
+      else
+        log "*          PID: #{Process.pid}"
+      end
     end
 
     def redirected_io?