diff --git a/ChangeLog b/ChangeLog
index a28c68e7..7e314ff2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-22  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Do exact match if IP address is specified in --no-proxy.
+	* src/AbstractCommand.cc
+
 2010-03-22  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Fixed the bug that socket is added to EventPoll object twice. This
diff --git a/src/AbstractCommand.cc b/src/AbstractCommand.cc
index 22e01b32..084b10c2 100644
--- a/src/AbstractCommand.cc
+++ b/src/AbstractCommand.cc
@@ -464,7 +464,11 @@ static bool inNoProxy(const SharedHandle<Request>& req,
         eoi = entries.end(); i != eoi; ++i) {
     std::string::size_type slashpos = (*i).find('/');
     if(slashpos == std::string::npos) {
-      if(domainMatch(*i)) {
+      if(util::isNumericHost(*i)) {
+        if(req->getHost() == *i) {
+          return true;
+        }
+      } else if(domainMatch(*i)) {
         return true;
       }
     } else {