diff --git a/src/charts/Chart.Scatter.js b/src/charts/Chart.Scatter.js
index ee1ec474a..124cbad77 100644
--- a/src/charts/Chart.Scatter.js
+++ b/src/charts/Chart.Scatter.js
@@ -24,15 +24,27 @@
 		},
 
 		tooltips: {
-			template: "(<%= value.x %>, <%= value.y %>)",
-			multiTemplate: "<%if (datasetLabel){%><%=datasetLabel%>: <%}%>(<%= value.x %>, <%= value.y %>)",
+			callbacks: {
+				title: function(tooltipItems, data) {
+					// Title doesn't make sense for scatter since we format the data as a point
+					return '';
+				},
+				label: function(tooltipItem, data) {
+					return '(' + tooltipItem.xLabel + ', ' + tooltipItem.yLabel + ')';
+				}
+			}
 		},
-
 	};
 
+	// Register the default config for this type
+	Chart.defaults.scatter = defaultConfig;
+
+	// Scatter charts use line controllers
+	Chart.controllers.scatter = Chart.controllers.line;
+
 	Chart.Scatter = function(context, config) {
-		config.options = helpers.configMerge(defaultConfig, config.options);
-		config.type = 'line';
+		//config.options = helpers.configMerge(defaultConfig, config.options);
+		config.type = 'scatter';
 		return new Chart(context, config);
 	};