diff --git a/CHANGELOG b/CHANGELOG
index 97648f4f..13fd4bbf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,7 +19,7 @@ HISTORY
 
   ++ New features:
 
-  2008-12-03 Simon Goldschmidt (base on patch from Luca Cereoli)
+  2008-12-03 Simon Goldschmidt (base on patch from Luca Ceresoli)
   * autoip.c: checked in (slightly modified) patch #6683: Customizable AUTOIP
     "seed" address. This should reduce AUTOIP conflicts if
     LWIP_AUTOIP_CREATE_SEED_ADDR is overridden.
diff --git a/src/core/ipv4/autoip.c b/src/core/ipv4/autoip.c
index 2749bec7..367adb06 100644
--- a/src/core/ipv4/autoip.c
+++ b/src/core/ipv4/autoip.c
@@ -79,9 +79,9 @@
 /* 169.254.0.0 */
 #define AUTOIP_NET         0xA9FE0000
 /* 169.254.1.0 */
-#define AUTOIP_RANGE_START AUTOIP_NET | 0x0100
+#define AUTOIP_RANGE_START (AUTOIP_NET | 0x0100)
 /* 169.254.254.255 */
-#define AUTOIP_RANGE_END   AUTOIP_NET | 0xFEFF
+#define AUTOIP_RANGE_END   (AUTOIP_NET | 0xFEFF)
 
 
 /** Pseudo random macro based on netif informations.