diff --git a/src/include/lwip/opt.h b/src/include/lwip/opt.h
index 38348f7a..a8942ca8 100644
--- a/src/include/lwip/opt.h
+++ b/src/include/lwip/opt.h
@@ -168,12 +168,10 @@ a lot of data that needs to be copied, this should be set high. */
 #ifndef ARP_QUEUEING
 #define ARP_QUEUEING                    1
 #endif
-/** If enabled, the first packet queued will not be overwritten by
- * later packets. If disabled, later packets overwrite early packets
- * in the queue. Default is disabled, which is recommended. 
- */
-#ifndef ARP_QUEUE_FIRST
-#define ARP_QUEUE_FIRST                 0
+
+/* This option is deprecated */
+#ifdef ETHARP_QUEUE_FIRST
+#error ETHARP_QUEUE_FIRST option is deprecated. Remove it from your lwipopts.h.
 #endif
 
 /* This option is removed to comply with the ARP standard */
diff --git a/src/netif/etharp.c b/src/netif/etharp.c
index f9e330b1..201630d5 100644
--- a/src/netif/etharp.c
+++ b/src/netif/etharp.c
@@ -190,7 +190,7 @@ static s8_t find_entry(struct ip_addr *ipaddr, u8_t flags)
 {
   s8_t old_pending, old_stable, empty, i;
   u8_t age_pending, age_stable;
-#if ETHARP_QUEUEING
+#if ARP_QUEUEING
   s8_t old_queue = ARP_TABLE_SIZE;;
   u8_t age_queue = 0;
 #endif
@@ -227,7 +227,7 @@ static s8_t find_entry(struct ip_addr *ipaddr, u8_t flags)
         LWIP_DEBUGF(ETHARP_DEBUG | DBG_TRACE, ("find_entry: found matching pending entry %d\n", i));
         /* found match, simply bail out */
         return i;
-#if ETHARP_QUEUEING
+#if ARP_QUEUEING
       /* pending with queued packets? */
       } else if (arp_table[i].p != NULL) {
         if (arp_table[i].ctime >= age_queue) {