2 files changed, 7 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 7c2b4b3ce2..46bab4af1b 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,10 @@ with all sufficient information, see the ChangeLog file or Redmine
   * Array#append  [Feature #12746]
   * Array#prepend  [Feature #12746]
 
+* Data
+
+  * Now deprecated [Feature #3072]
+
 * Dir
 
   * Dir.glob provides new optional keyword argument, :base.
diff --git a/object.c b/object.c
index ba43eaf70c..faafa489e5 100644
--- a/object.c
+++ b/object.c
@@ -4076,11 +4076,12 @@ InitVM_Object(void)
     /*
      * Document-class: Data
      *
-     * This is a recommended base class for C extensions using Data_Make_Struct
-     * or Data_Wrap_Struct, see doc/extension.rdoc for details.
+     * This is a deprecated class, base class for C extensions using
+     * Data_Make_Struct or Data_Wrap_Struct.
      */
     rb_cData = rb_define_class("Data", rb_cObject);
     rb_undef_alloc_func(rb_cData);
+    rb_deprecate_constant(rb_cObject, "Data");
 
     rb_cTrueClass = rb_define_class("TrueClass", rb_cObject);
     rb_define_method(rb_cTrueClass, "to_s", true_to_s, 0);