diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22fd426..7138993 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog for Craft CMS Server Check
 
+## 2.1.6 - 2023-09-09
+- Added a requirement for [`opcache.save_comments`](https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.save-comments) to be enabled if OPcache is installed. ([craftcms/cms#13631](https://github.com/craftcms/cms/discussions/13631))  
+
 ## 2.1.5 - 2023-05-26
 - Fixed an error that could occur when running the requirements checker using PHP 8+.
 
diff --git a/server/requirements/requirements.php b/server/requirements/requirements.php
index 66a1279..3a86a8b 100644
--- a/server/requirements/requirements.php
+++ b/server/requirements/requirements.php
@@ -141,6 +141,14 @@
         'condition' => extension_loaded('mbstring') && ini_get('mbstring.func_overload') == 0,
         'memo' => 'Craft CMS requires the <a rel="noopener" target="_blank" href="https://php.net/manual/en/book.mbstring.php">Multibyte String</a> extension with <a rel="noopener" target="_blank" href="https://php.net/manual/en/mbstring.overload.php">Function Overloading</a> disabled in order to run.'
     ),
+    array(
+        'name' => extension_loaded('opcache') ? 'OPcache extension (with save_comments)' : 'OPcache extension',
+        'mandatory' => extension_loaded('opcache'),
+        'condition' => extension_loaded('opcache') && ini_get('opcache.save_comments') == 1,
+        'memo' => extension_loaded('opcache')
+            ? 'The <a rel="noopener" target="_blank" href="https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.save-comments">opcache.save_comments</a> configuration setting must be enabled.'
+            : 'The <a rel="noopener" target="_blank" href="https://php.net/manual/en/book.opcache.php">OPcache</a> extension is recommended in production environments.'
+    ),
     array(
         'name' => 'OpenSSL extension',
         'mandatory' => true,