2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cae59ca8de..8c33030d6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 21 11:12:53 2016  Dan Martinez  <dfm@razorwind.org>
+
+	* io.c (Init_IO): [DOC] define dummy ARGF instead of ARGF.class to
+	  re-enable the generation of ARGF documentation.  [Fix GH-1358]
+
 Sat May 21 11:07:29 2016  0x01f7  <souk.0x01f7@gmail.com>
 
 	* doc/syntax/methods.rdoc (Method Names): add proper closing tag.
diff --git a/io.c b/io.c
index f4cc940865..5508ec7a2b 100644
--- a/io.c
+++ b/io.c
@@ -12425,7 +12425,7 @@ Init_IO(void)
 
 #if 0
     /* Hack to get rdoc to regard ARGF as a class: */
-    rb_cARGF = rb_define_class("ARGF.class", rb_cObject);
+    rb_cARGF = rb_define_class("ARGF", rb_cObject);
 #endif
 
     rb_cARGF = rb_class_new(rb_cObject);