diff --git a/paper-input-container.html b/paper-input-container.html
index 297410d3..61838bc2 100644
--- a/paper-input-container.html
+++ b/paper-input-container.html
@@ -226,6 +226,11 @@
         @apply(--paper-input-container-label-floating);
       }
 
+      .input-content.label-is-floating ::content label .label-required,
+      .input-content.label-is-floating ::content .paper-input-label .label-required{
+        color: var(--error-color);
+      }
+
       :host-context([dir="rtl"]) .input-content.label-is-floating ::content label,
       :host-context([dir="rtl"]) .input-content.label-is-floating ::content .paper-input-label {
         /* TODO(noms): Figure out why leaving the width at 133% before the animation
diff --git a/paper-input.html b/paper-input.html
index 13cdf97e..262ca24e 100644
--- a/paper-input.html
+++ b/paper-input.html
@@ -95,7 +95,10 @@
 
       <content select="[prefix]"></content>
 
-      <label hidden$="[[!label]]">[[label]]</label>
+      <label hidden$="[[!label]]">
+        [[label]]
+        <span class="label-required" hidden$="[[!required]]">*</span>
+      </label>
 
       <input is="iron-input" id="input"
         aria-labelledby$="[[_ariaLabelledBy]]"
diff --git a/paper-textarea.html b/paper-textarea.html
index 91800dc8..30073232 100644
--- a/paper-textarea.html
+++ b/paper-textarea.html
@@ -43,7 +43,10 @@
 
     <paper-input-container no-label-float$="[[noLabelFloat]]" always-float-label="[[_computeAlwaysFloatLabel(alwaysFloatLabel,placeholder)]]" auto-validate$="[[autoValidate]]" disabled$="[[disabled]]" invalid="[[invalid]]">
 
-      <label hidden$="[[!label]]">[[label]]</label>
+      <label hidden$="[[!label]]">
+        [[label]]
+        <span class="label-required" hidden$="[[!required]]">*</span>
+      </label>
 
       <iron-autogrow-textarea id="input" class="paper-input-input"
         bind-value="{{value}}"