diff --git a/ChangeLog b/ChangeLog
index 630eaf5fc2..9ff6a70e35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 26 05:00:13 2016  Benoit Daloze  <eregontp@gmail.com>
+
+	* class.c (rb_define_class): Fix documentation.
+
 Wed May 25 20:50:12 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* re.c (unescape_nonascii): scan hex up to only 3 characters.
diff --git a/class.c b/class.c
index 9d91cf73a8..1215b6d93d 100644
--- a/class.c
+++ b/class.c
@@ -630,12 +630,12 @@ rb_class_inherited(VALUE super, VALUE klass)
  * Defines a top-level class.
  * \param name   name of the class
  * \param super  a class from which the new class will derive.
- *               NULL means \c Object class.
  * \return the created class
  * \throw TypeError if the constant name \a name is already taken but
  *                  the constant is not a \c Class.
- * \throw NameError if the class is already defined but the class can not
+ * \throw TypeError if the class is already defined but the class can not
  *                  be reopened because its superclass is not \a super.
+ * \throw ArgumentError if the \a super is NULL.
  * \post top-level constant named \a name refers the returned class.
  *
  * \note if a class named \a name is already defined and its superclass is