diff --git a/source/includes/fact-timeZoneInfo.rst b/source/includes/fact-timeZoneInfo.rst
index 9af599d1cfc..fad8926aa94 100644
--- a/source/includes/fact-timeZoneInfo.rst
+++ b/source/includes/fact-timeZoneInfo.rst
@@ -1,12 +1,13 @@
 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 and macOS 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.
+database <https://www.iana.org/time-zones>`_. It is updated along with
+MongoDB releases, but the time zone database release cycle
+differs from the MongoDB release cycle. The most recent release of
+the time zone database is available on our `download site
+<https://downloads.mongodb.org/olson_tz_db/timezonedb-latest.zip>`_.
+
diff --git a/source/includes/warning-timeZoneInfo.rst b/source/includes/warning-timeZoneInfo.rst
new file mode 100644
index 00000000000..c8ab339d59d
--- /dev/null
+++ b/source/includes/warning-timeZoneInfo.rst
@@ -0,0 +1,13 @@
+.. warning::
+
+   MongoDB uses the third party `timelib
+   <https://github.com/derickr/timelib>`_ library to provide accurate
+   conversions between timezones. Due to a recent update, ``timelib``
+   could create inaccurate time zone conversions in older versions of
+   MongoDB.
+
+   To explicitly link to the time zone database in versions of MongoDB
+   prior to 4.0.25, download the `time zone database
+   <https://downloads.mongodb.org/olson_tz_db/timezonedb-latest.zip>`_.
+   and use the :option:`timeZoneInfo <mongod --timeZoneInfo>` parameter.
+
diff --git a/source/reference/configuration-options.txt b/source/reference/configuration-options.txt
index 02146befff6..e74fa76c3cb 100644
--- a/source/reference/configuration-options.txt
+++ b/source/reference/configuration-options.txt
@@ -664,7 +664,8 @@ Core Options
    *Type*: string
 
    .. include:: /includes/fact-timeZoneInfo.rst
-   
+
+   .. include::  /includes/warning-timeZoneInfo.rst
 
 
 .. _free-monitoring-configuration-options:
diff --git a/source/reference/program/mongod.txt b/source/reference/program/mongod.txt
index d4961d9808a..e240a33e5fe 100644
--- a/source/reference/program/mongod.txt
+++ b/source/reference/program/mongod.txt
@@ -694,9 +694,12 @@ Core Options
       wget https://downloads.mongodb.org/olson_tz_db/timezonedb-latest.zip
       unzip timezonedb-latest.zip
       mongod --timeZoneInfo timezonedb-2017b/
+
+   .. include::  /includes/warning-timeZoneInfo.rst
+
+   .. seealso::
    
-   .. seealso:: :setting:`processManagement.timeZoneInfo`.
-   
+      :setting:`processManagement.timeZoneInfo`.
 
 
 .. option:: --serviceExecutor <string>
diff --git a/source/reference/program/mongos.txt b/source/reference/program/mongos.txt
index 0049130edc4..a1ae7ce2ce9 100644
--- a/source/reference/program/mongos.txt
+++ b/source/reference/program/mongos.txt
@@ -540,7 +540,6 @@ Core Options
           consistent performance and use less resources when there are
           more inactive connections than database requests.
 
-
 .. option:: --timeZoneInfo <path>
 
    .. include:: /includes/fact-timeZoneInfo.rst
@@ -550,8 +549,8 @@ Core Options
       wget https://downloads.mongodb.org/olson_tz_db/timezonedb-latest.zip
       unzip timezonedb-latest.zip
       mongos --timeZoneInfo timezonedb-2017b/
-   
 
+   .. include::  /includes/warning-timeZoneInfo.rst
 
 Sharded Cluster Options
 ~~~~~~~~~~~~~~~~~~~~~~~