diff --git a/source/_components/notify.aws_lambda.markdown b/source/_components/notify.aws_lambda.markdown
index 1eee6770b08..64c9c229926 100644
--- a/source/_components/notify.aws_lambda.markdown
+++ b/source/_components/notify.aws_lambda.markdown
@@ -66,7 +66,7 @@ The context will look like this:
     "latitude": 44.1234,
     "location_name": "Home",
     "longitude": 5.5678,
-    "temperature_unit": "°C",
+    "unit_system": "metric",
     "time_zone": "Europe/Zurich",
     "version": "0.20.0.dev0"
   },
diff --git a/source/_cookbook/configuration_yaml_from_bassclarinetl2 b/source/_cookbook/configuration_yaml_from_bassclarinetl2
index 91af768b15e..f745782619a 100644
--- a/source/_cookbook/configuration_yaml_from_bassclarinetl2
+++ b/source/_cookbook/configuration_yaml_from_bassclarinetl2
@@ -4,8 +4,8 @@ homeassistant:
   # Location required to calculate the time the sun rises and sets
   latitude: 37
   longitude: -121
-  # C for Celcius, F for Fahrenheit
-  temperature_unit: F
+  # 'metric' for Metric, 'imperial' for Imperial
+  unit_system: imperial
   # Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
   time_zone: America/Los_Angeles
   customize:
diff --git a/source/_cookbook/configuration_yaml_from_bassclarinetl2.markdown b/source/_cookbook/configuration_yaml_from_bassclarinetl2.markdown
index dd69f051804..2d0c634caa8 100644
--- a/source/_cookbook/configuration_yaml_from_bassclarinetl2.markdown
+++ b/source/_cookbook/configuration_yaml_from_bassclarinetl2.markdown
@@ -17,8 +17,8 @@ homeassistant:
   # Location required to calculate the time the sun rises and sets
   latitude: 37
   longitude: -121
-  # C for Celcius, F for Fahrenheit
-  temperature_unit: F
+  # 'metric' for Metric, 'imperial' for Imperial
+  unit_system: imperial
   # Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
   time_zone: America/Los_Angeles
   customize:
diff --git a/source/_topics/splitting_configuration.markdown b/source/_topics/splitting_configuration.markdown
index 40d3ccd5b93..4a2898eb92e 100644
--- a/source/_topics/splitting_configuration.markdown
+++ b/source/_topics/splitting_configuration.markdown
@@ -26,8 +26,8 @@ homeassistant:
   # Location required to calculate the time the sun rises and sets
   latitude: 37
   longitude: -121
-  # C for Celsius, F for Fahrenheit
-  temperature_unit: F
+  # 'metric' for Metric, 'imperial' for Imperial
+  unit_system: imperial
   # Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
   time_zone: America/Los_Angeles
   customize: !include customize.yaml
diff --git a/source/developers/rest_api.markdown b/source/developers/rest_api.markdown
index f8fd4f5429b..e9dc9cc6d3b 100644
--- a/source/developers/rest_api.markdown
+++ b/source/developers/rest_api.markdown
@@ -89,7 +89,7 @@ Returns the current configuration as JSON.
     "latitude": 44.1234,
     "location_name": "Home",
     "longitude": 5.5678,
-    "temperature_unit": "\u00b0C",
+    "unit_system": "metric",
     "time_zone": "Europe/Zurich",
     "version": "0.8.0.dev0"
 }
diff --git a/source/getting-started/basic.markdown b/source/getting-started/basic.markdown
index 0c1b80f1730..90df0ccd559 100644
--- a/source/getting-started/basic.markdown
+++ b/source/getting-started/basic.markdown
@@ -22,8 +22,8 @@ homeassistant:
   # Impacts weather/sunrise data (altitude above sea level) 
   elevation: 430
 
-  # C for Celsius, F for Fahrenheit
-  temperature_unit: C
+  # 'metric' for Metric, 'imperial' for Imperial
+  unit_system: metric
 
   # Pick yours from here:
   # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones