diff --git a/ChangeLog b/ChangeLog
index 594764917f..c3aa69ad2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 16 11:17:51 2016  Koichi ITO  <koic.ito@gmail.com>
+
+	* lib/net/http/header.rb: Fix typo. [ci skip][fix GH-1407]
+	* transcode.c: ditto.
+
 Tue Aug 16 11:02:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* tool/make-snapshot (package): save generated header files from
diff --git a/lib/net/http/header.rb b/lib/net/http/header.rb
index 9a6a360fe2..63a163afbd 100644
--- a/lib/net/http/header.rb
+++ b/lib/net/http/header.rb
@@ -388,7 +388,7 @@ module Net::HTTPHeader
 
   alias form_data= set_form_data
 
-  # Set a HTML form data set.
+  # Set an HTML form data set.
   # +params+ is the form data set; it is an Array of Arrays or a Hash
   # +enctype is the type to encode the form data set.
   # It is application/x-www-form-urlencoded or multipart/form-data.
diff --git a/transcode.c b/transcode.c
index 8aa9cf3352..2c0b30ca0e 100644
--- a/transcode.c
+++ b/transcode.c
@@ -3344,7 +3344,7 @@ rb_econv_init_by_convpath(VALUE self, VALUE convpath,
  *   Convert LF to CR.
  * [:xml => :text]
  *   Escape as XML CharData.
- *   This form can be used as a HTML 4.0 #PCDATA.
+ *   This form can be used as an HTML 4.0 #PCDATA.
  *   - '&' -> '&amp;'
  *   - '<' -> '&lt;'
  *   - '>' -> '&gt;'
@@ -3352,7 +3352,7 @@ rb_econv_init_by_convpath(VALUE self, VALUE convpath,
  * [:xml => :attr]
  *   Escape as XML AttValue.
  *   The converted result is quoted as "...".
- *   This form can be used as a HTML 4.0 attribute value.
+ *   This form can be used as an HTML 4.0 attribute value.
  *   - '&' -> '&amp;'
  *   - '<' -> '&lt;'
  *   - '>' -> '&gt;'