diff --git a/ChangeLog b/ChangeLog
index 09d8fb71d9..af148668ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 23 15:25:51 2015  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: remove an empty comment line and -*-.
+
 Fri Oct 23 15:20:02 2015  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/ftp.rb (gettextfile, getbinaryfile): use the safe
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 5d642ecac4..8ddeb94c63 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -1,5 +1,4 @@
-#
-# -*- frozen_string_literal: true -*-
+# frozen_string_literal: true
 #
 # = net/imap.rb
 #
diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
index 20172204e3..d68342c067 100644
--- a/test/net/imap/test_imap.rb
+++ b/test/net/imap/test_imap.rb
@@ -1,5 +1,4 @@
-#
-# -*- frozen_string_literal: true -*-
+# frozen_string_literal: true
 
 require "net/imap"
 require "test/unit"
diff --git a/test/net/imap/test_imap_response_parser.rb b/test/net/imap/test_imap_response_parser.rb
index 1104a490fa..db07f9b022 100644
--- a/test/net/imap/test_imap_response_parser.rb
+++ b/test/net/imap/test_imap_response_parser.rb
@@ -1,5 +1,4 @@
-#
-# -*- frozen_string_literal: true -*-
+# frozen_string_literal: true
 
 require "net/imap"
 require "test/unit"