diff --git a/CHANGELOG b/CHANGELOG
index eefa9135..e85ab3f9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -25,6 +25,10 @@ HISTORY
 
   ++ Bugfixes:
 
+  2009-08-23 Simon Goldschmidt
+  * netdb.c, dns.c: bug #26657: DNS, if host name is "localhost", result
+    is error.
+
   2009-08-23 Simon Goldschmidt
   * opt.h, init.c: bug #26649: TCP fails when TCP_MSS > TCP_SND_BUF
     Fixed wrong parenthesis, added check in init.c
diff --git a/src/api/netdb.c b/src/api/netdb.c
index 8aa237f4..e37bfcbc 100644
--- a/src/api/netdb.c
+++ b/src/api/netdb.c
@@ -300,7 +300,7 @@ lwip_getaddrinfo(const char *nodename, const char *servname,
     }
   } else {
     /* service location specified, use loopback address */
-    addr.addr = INADDR_LOOPBACK;
+    addr.addr = htonl(INADDR_LOOPBACK);
   }
 
   ai = mem_malloc(sizeof(struct addrinfo));
diff --git a/src/core/dns.c b/src/core/dns.c
index 62a2592e..b955538c 100644
--- a/src/core/dns.c
+++ b/src/core/dns.c
@@ -961,7 +961,7 @@ dns_gethostbyname(const char *hostname, struct ip_addr *addr, dns_found_callback
 
 #if LWIP_HAVE_LOOPIF
   if (strcmp(hostname,"localhost")==0) {
-    addr->addr = INADDR_LOOPBACK;
+    addr->addr = htonl(INADDR_LOOPBACK);
     return ERR_OK;
   }
 #endif /* LWIP_HAVE_LOOPIF */