diff --git a/homeassistant/components/hvac/__init__.py b/homeassistant/components/hvac/__init__.py
index abd40a3ac93..ab27af480a7 100644
--- a/homeassistant/components/hvac/__init__.py
+++ b/homeassistant/components/hvac/__init__.py
@@ -135,6 +135,9 @@ def set_swing_mode(hass, swing_mode, entity_id=None):
 # pylint: disable=too-many-branches
 def setup(hass, config):
     """Setup hvacs."""
+    _LOGGER.warning('This component has been deprecated in favour of'
+                    ' the "climate" component and will be removed '
+                    'in the future. Please upgrade.')
     component = EntityComponent(_LOGGER, DOMAIN, hass, SCAN_INTERVAL)
     component.setup(config)
 
diff --git a/homeassistant/components/thermostat/__init__.py b/homeassistant/components/thermostat/__init__.py
index 09a18b91402..a9169ce4756 100644
--- a/homeassistant/components/thermostat/__init__.py
+++ b/homeassistant/components/thermostat/__init__.py
@@ -115,6 +115,9 @@ def set_hvac_mode(hass, hvac_mode, entity_id=None):
 # pylint: disable=too-many-branches
 def setup(hass, config):
     """Setup thermostats."""
+    _LOGGER.warning('This component has been deprecated in favour of'
+                    ' the "climate" component and will be removed '
+                    'in the future. Please upgrade.')
     component = EntityComponent(_LOGGER, DOMAIN, hass, SCAN_INTERVAL)
     component.setup(config)