diff --git a/ChangeLog b/ChangeLog
index 7fa34d3607..c6c130351b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 14 11:12:10 2015  Anton Davydov  <antondavydov.o@gmail.com>
+
+	* lib/racc/rdoc/grammar.en.rdoc: [DOC] fix typo, "convertion" to
+	  "conversion".  [Fix GH-1016]
+
 Sun Sep 13 11:03:13 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/ruby.h: prefix RUBY or RB to global symbols to get
diff --git a/lib/racc/rdoc/grammar.en.rdoc b/lib/racc/rdoc/grammar.en.rdoc
index a154246ee5..28d5129068 100644
--- a/lib/racc/rdoc/grammar.en.rdoc
+++ b/lib/racc/rdoc/grammar.en.rdoc
@@ -20,7 +20,7 @@ The class block is formed like this:
     [token declarations]
     [expected number of S/R conflicts]
     [options]
-    [semantic value convertion]
+    [semantic value conversion]
     [start rule]
   rule
     GRAMMARS