diff --git a/ChangeLog b/ChangeLog
index 3f390f57..97ac4924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Tue Mar 25 12:53:55 CET 2014
+	Fix limiting by IPv6 address. -EG
+
 Tue Mar 25 09:06:13 CET 2014
 	Added more FD_SETSIZE checks.
 	Implemented FD_SETSIZE checks for W32. -EG
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 1c058da0..5d58fa9e 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -184,7 +184,7 @@ struct MHD_IPCount
      * IPv4 address.
      */
     struct in_addr ipv4;
-#if HAVE_IPV6
+#if HAVE_INET6
     /**
      * IPv6 address.
      */
@@ -269,7 +269,7 @@ MHD_ip_addr_to_key (const struct sockaddr *addr,
       return MHD_YES;
     }
 
-#if HAVE_IPV6
+#if HAVE_INET6
   /* IPv6 addresses */
   if (sizeof (struct sockaddr_in6) == addrlen)
     {