diff --git a/doc/manpages/swift-recon.1 b/doc/manpages/swift-recon.1
index 3120405005..15865a2500 100644
--- a/doc/manpages/swift-recon.1
+++ b/doc/manpages/swift-recon.1
@@ -83,7 +83,9 @@ Get drive audit error stats
 .IP "\fB-T, --time\fR"
 Check time synchronization
 .IP "\fB--all\fR"
-Perform all checks. Equivalent to \-arudlqT \-\-md5
+Perform all checks. Equivalent to \-arudlqT
+\-\-md5 \-\-sockstat \-\-auditor \-\-updater \-\-expirer
+\-\-driveaudit \-\-validate\-servers
 .IP "\fB--region=REGION\fR"
 Only query servers in specified region
 .IP "\fB-z ZONE, --zone=ZONE\fR"
diff --git a/doc/source/admin_guide.rst b/doc/source/admin_guide.rst
index c2236e9508..cb6532b4be 100644
--- a/doc/source/admin_guide.rst
+++ b/doc/source/admin_guide.rst
@@ -589,7 +589,9 @@ This information can also be queried via the swift-recon command line utility::
       --md5                 Get md5sum of servers ring and compare to local copy
       --sockstat            Get cluster socket usage stats
       -T, --time            Check time synchronization
-      --all                 Perform all checks. Equal to -arudlqT --md5 --sockstat
+      --all                 Perform all checks. Equal to
+                            -arudlqT --md5 --sockstat --auditor --updater
+                            --expirer --driveaudit --validate-servers
       -z ZONE, --zone=ZONE  Only query servers in specified zone
       -t SECONDS, --timeout=SECONDS
                             Time to wait for a response from a server
diff --git a/swift/cli/recon.py b/swift/cli/recon.py
index a13dde1095..3af876b709 100644
--- a/swift/cli/recon.py
+++ b/swift/cli/recon.py
@@ -978,7 +978,8 @@ class SwiftRecon(object):
                         order.')
         args.add_option('--all', action="store_true",
                         help="Perform all checks. Equal to \t\t\t-arudlqT "
-                        "--md5 --sockstat --auditor --updater --expirer")
+                        "--md5 --sockstat --auditor --updater --expirer "
+                        "--driveaudit --validate-servers")
         args.add_option('--region', type="int",
                         help="Only query servers in specified region")
         args.add_option('--zone', '-z', type="int",
@@ -1018,22 +1019,21 @@ class SwiftRecon(object):
         if options.all:
             if self.server_type == 'object':
                 self.async_check(hosts)
-                self.replication_check(hosts)
                 self.object_auditor_check(hosts)
                 self.updater_check(hosts)
                 self.expirer_check(hosts)
             elif self.server_type == 'container':
-                self.replication_check(hosts)
                 self.auditor_check(hosts)
                 self.updater_check(hosts)
             elif self.server_type == 'account':
-                self.replication_check(hosts)
                 self.auditor_check(hosts)
+            self.replication_check(hosts)
             self.umount_check(hosts)
             self.load_check(hosts)
             self.disk_usage(hosts, options.top, options.lowest,
                             options.human_readable)
             self.get_ringmd5(hosts, swift_dir)
+            self.get_swiftconfmd5(hosts)
             self.quarantine_check(hosts)
             self.socket_usage(hosts)
             self.server_type_check(hosts)