diff --git a/source/_components/hvac.markdown b/source/_components/hvac.markdown
index c36a3fba84b..ab5be542488 100644
--- a/source/_components/hvac.markdown
+++ b/source/_components/hvac.markdown
@@ -10,7 +10,7 @@ footer: true
 ha_release: 0.19
 ---
 
-**This component has been deprecated in favor of the "climate" component and will be removed in the future. Please use climate.**
+**This component has been deprecated in favor of the "[climate](/components/climate/)" component and will be removed in the future. Please use climate.**
 
 The `hvac` component is built for the controlling and monitoring of HVAC (heating, ventilating, and air conditioning) devices.
  
diff --git a/source/_components/hvac.zwave.markdown b/source/_components/hvac.zwave.markdown
index 30c95663268..c63cb963fdd 100644
--- a/source/_components/hvac.zwave.markdown
+++ b/source/_components/hvac.zwave.markdown
@@ -8,10 +8,10 @@ comments: false
 sharing: true
 footer: true
 logo: z-wave.png
-ha_category: HVAC
+ha_category: Deprecated
 ha_release: 0.19
 ---
 
-**This platform has been deprecated in favor of a "climate" platform and will be removed in the future. Please use the climate platform.**
+**This platform has been deprecated in favor of a "[climate](/components/climate.zwave/)" platform and will be removed in the future. Please use the climate platform.**
 
 To get your Z-Wave `hvac` devices working with Home Assistant, follow the instructions for the general [Z-Wave component](/components/zwave/) and the [HVAC component](/components/hvac/).