diff --git a/ChangeLog b/ChangeLog
index 5932ccc3..fa5de843 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-10  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Use localhost instead of 127.0.0.1.
+	* test/DHTConnectionImplTest.cc
+	
 2009-02-10  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Suppressed compiler warning.
diff --git a/test/DHTConnectionImplTest.cc b/test/DHTConnectionImplTest.cc
index e920d429..9bc5b03a 100644
--- a/test/DHTConnectionImplTest.cc
+++ b/test/DHTConnectionImplTest.cc
@@ -34,8 +34,9 @@ void DHTConnectionImplTest::testWriteAndReadData()
     CPPUNIT_ASSERT(con2.bind(con2port));
 
     std::string message1 = "hello world.";
+    // hostname should be "localhost", not 127.0.0.1. Test failed on Mac OSX10.5
     con1.sendMessage(reinterpret_cast<const unsigned char*>(message1.c_str()),
-		     message1.size(), "127.0.0.1", con2port);
+		     message1.size(), "localhost", con2port);
 
     unsigned char readbuffer[100];
     std::string remoteHost;