diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 575b05c..fb330b7 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -3158,6 +3158,7 @@ function drupal_common_theme() {
     ),
     'status_messages' => array(
       'variables' => array('display' => NULL),
+      'template' => 'status-messages',
     ),
     'link' => array(
       'variables' => array('text' => NULL, 'path' => NULL, 'options' => array()),
diff --git a/core/modules/system/templates/status-messages.html.twig b/core/modules/system/templates/status-messages.html.twig
index 31d0517..8c2e1be 100644
--- a/core/modules/system/templates/status-messages.html.twig
+++ b/core/modules/system/templates/status-messages.html.twig
@@ -13,6 +13,8 @@
  *   - status_heading: List of all status types.
  *
  * @see template_preprocess_status_messages()
+ *
+ * @ingroup themeable
  */
 #}