diff --git a/ChangeLog b/ChangeLog
index e89334e9a1..d1dcb20f1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 16 16:57:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/un.rb (httpd): try to convert port number to integer.
+
 Wed Dec 16 11:18:30 2009  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* configure.in(MINIRUBY): use "$BASERUBY" as a default ruby executable
diff --git a/lib/un.rb b/lib/un.rb
index cf817cafc5..24c6024c71 100644
--- a/lib/un.rb
+++ b/lib/un.rb
@@ -304,6 +304,7 @@ def httpd
     |argv, options|
     require 'webrick'
     opt = options[:RequestTimeout] and options[:RequestTimeout] = opt.to_i
+    opt = options[:Port] and (options[:Port] = Integer(opt)) rescue nil
     unless argv.empty?
       options[:DocumentRoot] = argv.shift
     end