diff --git a/source/includes/fact-timeZoneInfo.rst b/source/includes/fact-timeZoneInfo.rst
index 0b146474380..9af599d1cfc 100644
--- a/source/includes/fact-timeZoneInfo.rst
+++ b/source/includes/fact-timeZoneInfo.rst
@@ -1,5 +1,12 @@
 The full path from which to load the time zone database. If this option
 is not provided, then MongoDB will use its built-in time zone database.
 
-The configuration file included with Linux packages sets the time zone
-database path to ``/usr/share/zoneinfo`` by default.
+The configuration file included with Linux and macOS packages sets the time
+zone database path to ``/usr/share/zoneinfo`` by default.
+
+The built-in time zone database is a copy of the `Olson/IANA time zone
+database <https://www.iana.org/time-zones>`_. It is updated along with MongoDB
+releases, but the release cycle of the time zone database differs from the
+release cycle of MongoDB. A copy of the most recent release of the time zone
+database can be downloaded from
+https://downloads.mongodb.org/olson_tz_db/timezonedb-latest.zip.
diff --git a/source/includes/options-conf.yaml b/source/includes/options-conf.yaml
index b2c5b3d73d4..10d02c32fa8 100644
--- a/source/includes/options-conf.yaml
+++ b/source/includes/options-conf.yaml
@@ -339,6 +339,8 @@ type: string
 directive: setting
 description: |
   .. include:: /includes/fact-timeZoneInfo.rst
+
+  .. seealso:: :option:`--timeZoneInfo`.
 ---
 program: conf
 name: processManagement.windowsService.serviceName
diff --git a/source/includes/options-mongod.yaml b/source/includes/options-mongod.yaml
index 535821048d7..48d8bd40821 100644
--- a/source/includes/options-mongod.yaml
+++ b/source/includes/options-mongod.yaml
@@ -2613,6 +2613,14 @@ directive: option
 args: <path>
 description: |
   .. include:: /includes/fact-timeZoneInfo.rst
+
+  .. code-block:: sh
+
+     wget https://downloads.mongodb.org/olson_tz_db/timezonedb-latest.zip
+     unzip timezonedb-latest.zip
+     mongod --timeZoneInfo timezonedb-2017b/
+
+  .. seealso:: :setting:`processManagement.timeZoneInfo`.
 optional: true
 ---
 program: mongod
diff --git a/source/includes/options-mongos.yaml b/source/includes/options-mongos.yaml
index 11bcff81b50..41ccfee99df 100644
--- a/source/includes/options-mongos.yaml
+++ b/source/includes/options-mongos.yaml
@@ -513,4 +513,17 @@ inherit:
   name: serviceExecutor
   program: _shared
   file: options-shared.yaml
+---
+program: mongos
+name: timeZoneInfo
+directive: option
+args: <path>
+description: |
+  .. include:: /includes/fact-timeZoneInfo.rst
+
+  .. code-block:: sh
+
+     wget https://downloads.mongodb.org/olson_tz_db/timezonedb-latest.zip
+     unzip timezonedb-latest.zip
+     mongos --timeZoneInfo timezonedb-2017b/
 ...
diff --git a/source/reference/program/mongos.txt b/source/reference/program/mongos.txt
index 44cfcac0863..9223801346b 100644
--- a/source/reference/program/mongos.txt
+++ b/source/reference/program/mongos.txt
@@ -94,6 +94,8 @@ Core Options
 
 .. include:: /includes/option/option-mongos-serviceExecutor.rst
 
+.. include:: /includes/option/option-mongos-timeZoneInfo.rst
+
 Sharded Cluster Options
 ~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/source/release-notes/3.6.txt b/source/release-notes/3.6.txt
index e8c4e1c847e..9c45f58f84f 100644
--- a/source/release-notes/3.6.txt
+++ b/source/release-notes/3.6.txt
@@ -455,10 +455,10 @@ MongoDB 3.6 includes the following enhancements:
   deprecates/obsoletes the use of :option:`--enableMajorityReadConcern`
   and :setting:`replication.enableMajorityReadConcern`.
 
-- :program:`mongod` now offers a :option:`--timeZoneInfo` option. Use
-  this option to specify the path to your system time zone database.
-  The default configuration file included with Linux packages sets this
-  to ``/usr/share/zoneinfo``.
+- :program:`mongod` now offers a :option:`--timeZoneInfo` option. Use this
+  option to specify the path to your system time zone database. The default
+  configuration file included with Linux and macOS packages sets this to
+  ``/usr/share/zoneinfo``.
 
 - The new :parameter:`honorSystemUmask` startup option for
   :program:`mongod` causes new files created by MongoDB to have