diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index f98df80..3896d71 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -2418,6 +2418,12 @@ function template_preprocess_field(&$variables, $hook) {
     $delta++;
   }
 
+  // We have to know if the field has multiple values to create a simple value
+  // or a list.
+  if (count($variables['items']) > 1 ) {
+    $variables['multiple'] = TRUE;
+  }
+
   // Add default CSS classes. Since there can be many fields rendered on a page,
   // save some overhead by calling strtr() directly instead of
   // drupal_html_class().
diff --git a/core/modules/system/templates/field.html.twig b/core/modules/system/templates/field.html.twig
index a0d527a..9a62a5f 100644
--- a/core/modules/system/templates/field.html.twig
+++ b/core/modules/system/templates/field.html.twig
@@ -33,9 +33,27 @@
   {% if not label_hidden %}
     <div class="field-label"{{ title_attributes }}>{{ label }}:&nbsp;</div>
   {% endif %}
-  <div class="field-items"{{ content_attributes }}>
-    {% for delta, item in items %}
-      <div class="field-item"{{ item_attributes[delta] }}>{{ item }}</div>
-    {% endfor %}
+
+{% if multiple %}
+  <div class="{{ attributes.class }}"{{ attributes }}>
+     {% if not label_hidden %}
+       <div class="field-label"{{ title_attributes }}>{{ label }}</div>
+     {% endif %}
+     <ul class="field-items" {{ content_attributes }}>
+     {% for delta, item in items %}
+        <li class="field-item"{{ item_attributes[delta] }}>{{ item }}</li>
+      {% endfor %}
+      </ul>
   </div>
+  {% else %}
+  {% for delta, item in items %}
+    <div class="field-item{{ attributes.class }}"{{ attributes }}{{ content_attributes }}{{ item_attributes[delta] }}>
+     {% if not label_hidden %}
+       <div class="field-label"{{ title_attributes }}>{{ label }}</div>
+     {% endif %}
+     {{ item }}
+    </div>
+  {% endfor %}
+{% endif %}
+
 </div>