diff --git a/src/pynwb/ecephys.py b/src/pynwb/ecephys.py
index db7db3b66..5494aaf01 100644
--- a/src/pynwb/ecephys.py
+++ b/src/pynwb/ecephys.py
@@ -241,6 +241,11 @@ def __init__(self, **kwargs):
 @register_class('ClusterWaveforms', CORE_NAMESPACE)
 class ClusterWaveforms(NWBDataInterface):
     """
+    DEPRECATED. `ClusterWaveforms` was deprecated in Oct 27, 2018 and will be removed in a future release.
+    Please use the `Units` table to store waveform mean and standard deviation
+    e.g. `NWBFile.units.add_unit(..., waveform_mean=..., waveform_sd=...)`
+
+
     Describe cluster waveforms by mean and standard deviation for at each sample.
     """