diff --git a/Xamarin.Forms.Core/OnIdiom.cs b/Xamarin.Forms.Core/OnIdiom.cs
index 5d3226f7d..fa9a3599c 100644
--- a/Xamarin.Forms.Core/OnIdiom.cs
+++ b/Xamarin.Forms.Core/OnIdiom.cs
@@ -10,6 +10,8 @@ namespace Xamarin.Forms
 
 		public T TV { get; set; }
 
+		public T Watch { get; set; }
+
 		public static implicit operator T(OnIdiom<T> onIdiom)
 		{
 			switch (Device.Idiom)
@@ -23,6 +25,8 @@ namespace Xamarin.Forms
 					return onIdiom.Desktop;
 				case TargetIdiom.TV:
 					return onIdiom.TV;
+				case TargetIdiom.Watch:
+					return onIdiom.Watch;
 			}
 		}
 	}
diff --git a/Xamarin.Forms.Core/TargetIdiom.cs b/Xamarin.Forms.Core/TargetIdiom.cs
index 645ac1299..bae97a1b1 100644
--- a/Xamarin.Forms.Core/TargetIdiom.cs
+++ b/Xamarin.Forms.Core/TargetIdiom.cs
@@ -6,6 +6,7 @@ namespace Xamarin.Forms
 		Phone,
 		Tablet,
 		Desktop,
-		TV
+		TV,
+		Watch
 	}
 }
diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/OnIdiom`1.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/OnIdiom`1.xml
index 111752680..db57ea771 100644
--- a/docs/Xamarin.Forms.Core/Xamarin.Forms/OnIdiom`1.xml
+++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/OnIdiom`1.xml
@@ -156,5 +156,22 @@
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="Watch">
+      <MemberSignature Language="C#" Value="public T Watch { get; set; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance !T Watch" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>2.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>T</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Gets or sets the value applied on Watch-like devices.</summary>
+        <value>A T.</value>
+        <remarks>
+        </remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/TargetIdiom.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/TargetIdiom.xml
index 55a9d26a9..d5584a459 100644
--- a/docs/Xamarin.Forms.Core/Xamarin.Forms/TargetIdiom.xml
+++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/TargetIdiom.xml
@@ -114,5 +114,19 @@
         <summary>(Unused) Indicates that Forms is running on an unsupported device.</summary>
       </Docs>
     </Member>
+    <Member MemberName="Watch">
+      <MemberSignature Language="C#" Value="Watch" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.TargetIdiom Watch = int32(5)" />
+      <MemberType>Field</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>2.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Forms.TargetIdiom</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Indicates that Forms is running on a smart watch such as Samsing Gear S serires.</summary>
+      </Docs>
+    </Member>
   </Members>
 </Type>