diff --git a/CHANGELOG b/CHANGELOG
index 91d848ce..b0a3ba04 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -33,6 +33,9 @@ HISTORY
 
   ++ Bugfixes:
 
+  2010-01-06: Simon Goldschmidt
+  * netdb.h: Fixed bug #28496: missing include guards in netdb.h
+
   2009-12-31: Simon Goldschmidt
   * many ppp files: Reorganised PPP source code from ucip structure to pppd
     structure to easily compare our code against the pppd code (around v2.3.1)
diff --git a/src/include/lwip/netdb.h b/src/include/lwip/netdb.h
index 29c9847c..68ac3833 100644
--- a/src/include/lwip/netdb.h
+++ b/src/include/lwip/netdb.h
@@ -26,6 +26,8 @@
  * Author: Simon Goldschmidt
  *
  */
+#ifndef __LWIP_NETDB_H__
+#define __LWIP_NETDB_H__
 
 #include "lwip/opt.h"
 
@@ -109,3 +111,5 @@ int lwip_getaddrinfo(const char *nodename,
 #endif /* LWIP_COMPAT_SOCKETS */
 
 #endif /* LWIP_DNS && LWIP_SOCKET */
+
+#endif /* __LWIP_NETDB_H__ */