diff --git a/ChangeLog b/ChangeLog
index 5722c577b5..6294916301 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Mar 21 21:10:00 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/ipaddr.rb: Say that I am the current maintainer.
+
+	* lib/set.rb: Ditto.
+
+	* lib/shellwords.rb: Ditto.
+
+	* ext/syslog/syslog.txt: Ditto.
+
 Fri Mar 21 09:24:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* instruby.rb (open_for_install): write block result and rewrite only
diff --git a/ext/syslog/syslog.txt b/ext/syslog/syslog.txt
index 9aed35133d..35bd4cb057 100644
--- a/ext/syslog/syslog.txt
+++ b/ext/syslog/syslog.txt
@@ -7,7 +7,10 @@ Amos Gouaux, University of Texas at Dallas
 <amos+ruby@utdallas.edu>
 &
 Akinori MUSHA
-<knu@ruby-lang.org>
+<knu@iDaemons.org>
+
+Contact:
+  - Akinori MUSHA <knu@iDaemons.org> (current maintainer)
 
 ** Syslog(Module)
 
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index d69339a7c8..0c9b2ff0d2 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -9,8 +9,12 @@
 #
 # $Id$
 #
+# Contact:
+#   - Akinori MUSHA <knu@iDaemons.org> (current maintainer)
+#
 # TODO:
 #   - scope_id support
+#
 require 'socket'
 
 unless Socket.const_defined? "AF_INET6"
diff --git a/lib/set.rb b/lib/set.rb
index 12e9486ca3..3b30db0537 100644
--- a/lib/set.rb
+++ b/lib/set.rb
@@ -47,6 +47,10 @@
 #   s1.subset? s2                         # -> false
 #   s2.subset? s1                         # -> true
 #
+# == Contact
+#
+#   - Akinori MUSHA <knu@iDaemons.org> (current maintainer)
+#
 class Set
   include Enumerable
 
diff --git a/lib/shellwords.rb b/lib/shellwords.rb
index 3709ace30b..f1300612bb 100644
--- a/lib/shellwords.rb
+++ b/lib/shellwords.rb
@@ -13,6 +13,9 @@
 #   - Wakou Aoyama
 #   - Akinori MUSHA <knu@iDaemons.org>
 #
+# Contact:
+#   - Akinori MUSHA <knu@iDaemons.org> (current maintainer)
+#
 module Shellwords
   #
   # Splits a string into an array of tokens in the same way the UNIX