diff --git a/CHANGELOG b/CHANGELOG
index 49bf983eb5e..d288daac6a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ v 7.3.0
   - Better search with filtering, pagination etc
   - Added a checkbox to toggle line wrapping in diff (Yuriy Glukhov)
   - Prevent project stars duplication when fork project
+  - Use the default Unicorn socket backlog value of 1024
   - Support Unix domain sockets for Redis
   - Store session Redis keys in 'session:gitlab:' namespace
   - Deprecate LDAP account takeover based on partial LDAP email / GitLab username match
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example
index e88a4522338..c19a37ed062 100644
--- a/config/unicorn.rb.example
+++ b/config/unicorn.rb.example
@@ -28,9 +28,10 @@ worker_processes 2
 # "current" directory that Capistrano sets up.
 working_directory "/home/git/gitlab" # available in 0.94.0+
 
-# listen on both a Unix domain socket and a TCP port,
-# we use a shorter backlog for quicker failover when busy
-listen "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 64
+# Listen on both a Unix domain socket and a TCP port.
+# If you are load-balancing multiple Unicorn masters, lower the backlog
+# setting to e.g. 64 for faster failover.
+listen "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 1024
 listen "127.0.0.1:8080", :tcp_nopush => true
 
 # nuke workers after 30 seconds instead of 60 seconds (the default)