diff --git a/Perspex.Controls/Perspex.Controls.csproj b/Perspex.Controls/Perspex.Controls.csproj
index 5d967ab63e..5c5279b854 100644
--- a/Perspex.Controls/Perspex.Controls.csproj
+++ b/Perspex.Controls/Perspex.Controls.csproj
@@ -95,6 +95,7 @@
+
diff --git a/Perspex.Controls/ToolTip.cs b/Perspex.Controls/ToolTip.cs
new file mode 100644
index 0000000000..7114340492
--- /dev/null
+++ b/Perspex.Controls/ToolTip.cs
@@ -0,0 +1,102 @@
+// -----------------------------------------------------------------------
+//
+// Copyright 2015 MIT Licence. See licence.md for more information.
+//
+// -----------------------------------------------------------------------
+
+namespace Perspex.Controls
+{
+ using System;
+ using System.Reactive;
+ using System.Reactive.Linq;
+ using System.Reactive.Subjects;
+ using Perspex.Input;
+ using Perspex.Threading;
+ using Perspex.VisualTree;
+
+ public class ToolTip : ContentControl
+ {
+ public static readonly PerspexProperty