diff --git a/demos/ARM7-AT91SAM7X-LWIP-GCC/Makefile b/demos/ARM7-AT91SAM7X-LWIP-GCC/Makefile
index 81e62fe24..e9fe50d99 100644
--- a/demos/ARM7-AT91SAM7X-LWIP-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-LWIP-GCC/Makefile
@@ -70,8 +70,8 @@ CSRC = $(PORTSRC) \
        $(LWIPV4SRC) \
        $(LWAPISRC) \
        $(CHIBIOS)/os/various/evtimer.c \
+       $(CHIBIOS)/os/various/lwipthread.c \
        ./lwip/arch/sys_arch.c \
-       ./lwip/lwipthread.c \
        ./web/web.c \
        main.c
 
diff --git a/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.c b/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.c
deleted file mode 100644
index 298fff139..000000000
--- a/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
-                 2011,2012 Giovanni Di Sirio.
-
-    This file is part of ChibiOS/RT.
-
-    ChibiOS/RT is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    ChibiOS/RT is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/*
- * **** This file incorporates work covered by the following copyright and ****
- * **** permission notice:                                                 ****
- *
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-/**
- * @file lwipthread.c
- * @brief LWIP wrapper thread code.
- * @addtogroup LWIP_THREAD
- * @{
- */
-
-#include "ch.h"
-#include "hal.h"
-#include "evtimer.h"
-
-#include "lwip/opt.h"
-
-#include "lwip/def.h"
-#include "lwip/mem.h"
-#include "lwip/pbuf.h"
-#include "lwip/sys.h"
-#include <lwip/stats.h>
-#include <lwip/snmp.h>
-#include <lwip/tcpip.h>
-#include "netif/etharp.h"
-#include "netif/ppp_oe.h"
-
-#include "lwipthread.h"
-
-#define PERIODIC_TIMER_ID       1
-#define FRAME_RECEIVED_ID       2
-
-/**
- * Stack area for the LWIP-MAC thread.
- */
-WORKING_AREA(wa_lwip_thread, LWIP_THREAD_STACK_SIZE);
-
-/*
- * Initialization.
- */
-static void low_level_init(struct netif *netif) {
-  /* set MAC hardware address length */
-  netif->hwaddr_len = ETHARP_HWADDR_LEN;
-
-  /* maximum transfer unit */
-  netif->mtu = 1500;
-
-  /* device capabilities */
-  /* don't set NETIF_FLAG_ETHARP if this device is not an ethernet one */
-  netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_LINK_UP;
-
-  /* Do whatever else is needed to initialize interface. */
-}
-
-/*
- * Transmits a frame.
- */
-static err_t low_level_output(struct netif *netif, struct pbuf *p) {
-  struct pbuf *q;
-  MACTransmitDescriptor td;
-
-  (void)netif;
-  if (macWaitTransmitDescriptor(&ETH1, &td, MS2ST(LWIP_SEND_TIMEOUT)) != RDY_OK)
-    return ERR_TIMEOUT;
-
-#if ETH_PAD_SIZE
-  pbuf_header(p, -ETH_PAD_SIZE);        /* drop the padding word */
-#endif
-
-  /* Iterates through the pbuf chain. */
-  for(q = p; q != NULL; q = q->next) {
-    macWriteTransmitDescriptor(&td, (uint8_t *)q->payload, (size_t)q->len);
-  }
-  macReleaseTransmitDescriptor(&td);
-
-#if ETH_PAD_SIZE
-  pbuf_header(p, ETH_PAD_SIZE);         /* reclaim the padding word */
-#endif
-
-  LINK_STATS_INC(link.xmit);
-
-  return ERR_OK;
-}
-
-/*
- * Receives a frame.
- */
-static struct pbuf *low_level_input(struct netif *netif) {
-  MACReceiveDescriptor rd;
-  struct pbuf *p, *q;
-  u16_t len;
-
-  (void)netif;
-  if (macWaitReceiveDescriptor(&ETH1, &rd, TIME_IMMEDIATE) == RDY_OK) {
-    len = (u16_t)rd.size;
-
-#if ETH_PAD_SIZE
-    len += ETH_PAD_SIZE;        /* allow room for Ethernet padding */
-#endif
-
-    /* We allocate a pbuf chain of pbufs from the pool. */
-    p = pbuf_alloc(PBUF_RAW, len, PBUF_POOL);
-
-    if (p != NULL) {
-
-#if ETH_PAD_SIZE
-      pbuf_header(p, -ETH_PAD_SIZE); /* drop the padding word */
-#endif
-
-      /* Iterates through the pbuf chain. */
-      for(q = p; q != NULL; q = q->next) {
-        macReadReceiveDescriptor(&rd, (uint8_t *)q->payload, (size_t)q->len);
-      }
-      macReleaseReceiveDescriptor(&rd);
-
-#if ETH_PAD_SIZE
-      pbuf_header(p, ETH_PAD_SIZE); /* reclaim the padding word */
-#endif
-
-      LINK_STATS_INC(link.recv);
-    }
-    else {
-      macReleaseReceiveDescriptor(&rd);
-      LINK_STATS_INC(link.memerr);
-      LINK_STATS_INC(link.drop);
-    }
-    return p;
-  }
-  return NULL;
-}
-
-/*
- * Initialization.
- */
-static err_t ethernetif_init(struct netif *netif) {
-#if LWIP_NETIF_HOSTNAME
-  /* Initialize interface hostname */
-  netif->hostname = "lwip";
-#endif /* LWIP_NETIF_HOSTNAME */
-
-  /*
-   * Initialize the snmp variables and counters inside the struct netif.
-   * The last argument should be replaced with your link speed, in units
-   * of bits per second.
-   */
-  NETIF_INIT_SNMP(netif, snmp_ifType_ethernet_csmacd, LWIP_LINK_SPEED);
-
-  netif->state = NULL;
-  netif->name[0] = LWIP_IFNAME0;
-  netif->name[1] = LWIP_IFNAME1;
-  /* We directly use etharp_output() here to save a function call.
-   * You can instead declare your own function an call etharp_output()
-   * from it if you have to do some checks before sending (e.g. if link
-   * is available...) */
-  netif->output = etharp_output;
-  netif->linkoutput = low_level_output;
-
-  /* initialize the hardware */
-  low_level_init(netif);
-
-  return ERR_OK;
-}
-
-/**
- * @brief LWIP handling thread.
- *
- * @param[in] p pointer to a @p lwipthread_opts structure or @p NULL
- * @return The function does not return.
- */
-msg_t lwip_thread(void *p) {
-  EvTimer evt;
-  EventListener el0, el1;
-  struct ip_addr ip, gateway, netmask;
-  static struct netif thisif;
-  static const MACConfig mac_config = {thisif.hwaddr};
-
-  /* Initializes the thing.*/
-  sys_init();
-  mem_init();
-  memp_init();
-  pbuf_init();
-  netif_init();
-  ip_init();
-  tcpip_init(NULL, NULL);
-
-  /* TCP/IP parameters, runtime or compile time.*/
-  if (p) {
-    struct lwipthread_opts *opts = p;
-    unsigned i;
-
-    for (i = 0; i < 6; i++)
-      thisif.hwaddr[i] = opts->macaddress[i];
-    ip.addr = opts->address;
-    gateway.addr = opts->gateway;
-    netmask.addr = opts->netmask;
-  }
-  else {
-    thisif.hwaddr[0] = LWIP_ETHADDR_0;
-    thisif.hwaddr[1] = LWIP_ETHADDR_1;
-    thisif.hwaddr[2] = LWIP_ETHADDR_2;
-    thisif.hwaddr[3] = LWIP_ETHADDR_3;
-    thisif.hwaddr[4] = LWIP_ETHADDR_4;
-    thisif.hwaddr[5] = LWIP_ETHADDR_5;
-    LWIP_IPADDR(&ip);
-    LWIP_GATEWAY(&gateway);
-    LWIP_NETMASK(&netmask);
-  }
-  macStart(&ETH1, &mac_config);
-  netif_add(&thisif, &ip, &netmask, &gateway, NULL, ethernetif_init, tcpip_input);
-
-  netif_set_default(&thisif);
-  netif_set_up(&thisif);
-
-  /* Setup event sources.*/
-  evtInit(&evt, S2ST(5));
-  evtStart(&evt);
-  chEvtRegisterMask(&evt.et_es, &el0, PERIODIC_TIMER_ID);
-  chEvtRegisterMask(macGetReceiveEventSource(&ETH1), &el1, FRAME_RECEIVED_ID);
-  chEvtAddFlags(PERIODIC_TIMER_ID | FRAME_RECEIVED_ID);
-
-  /* Goes to the final priority after initialization.*/
-  chThdSetPriority(LWIP_THREAD_PRIORITY);
-
-  while (TRUE) {
-    eventmask_t mask = chEvtWaitAny(ALL_EVENTS);
-    if (mask & PERIODIC_TIMER_ID)
-      (void)macPollLinkStatus(&ETH1);
-    if (mask & FRAME_RECEIVED_ID) {
-      struct pbuf *p;
-      while ((p = low_level_input(&thisif)) != NULL) {
-        struct eth_hdr *ethhdr = p->payload;
-        switch (htons(ethhdr->type)) {
-        /* IP or ARP packet? */
-        case ETHTYPE_IP:
-        case ETHTYPE_ARP:
-#if PPPOE_SUPPORT
-        /* PPPoE packet? */
-        case ETHTYPE_PPPOEDISC:
-        case ETHTYPE_PPPOE:
-#endif /* PPPOE_SUPPORT */
-          /* full packet send to tcpip_thread to process */
-          if (thisif.input(p, &thisif) == ERR_OK)
-            break;
-          LWIP_DEBUGF(NETIF_DEBUG, ("ethernetif_input: IP input error\n"));
-        default:
-          pbuf_free(p);
-        }
-      }
-    }
-  }
-  return 0;
-}
-
-/** @} */
diff --git a/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.h b/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.h
deleted file mode 100644
index fc608642e..000000000
--- a/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
-                 2011,2012 Giovanni Di Sirio.
-
-    This file is part of ChibiOS/RT.
-
-    ChibiOS/RT is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    ChibiOS/RT is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file lwipthread.h
- * @brief LWIP wrapper thread macros and structures.
- * @addtogroup LWIP_THREAD
- * @{
- */
-
-#ifndef _LWIPTHREAD_H_
-#define _LWIPTHREAD_H_
-
-/** @brief MAC thread priority.*/
-#ifndef LWIP_THREAD_PRIORITY
-#define LWIP_THREAD_PRIORITY    LOWPRIO
-#endif
-
-/** @brief IP Address. */
-#if !defined(LWIP_IPADDR) || defined(__DOXYGEN__)
-#define LWIP_IPADDR(p)          IP4_ADDR(p, 192, 168, 1, 20)
-#endif
-
-/** @brief IP Gateway. */
-#if !defined(LWIP_GATEWAY) || defined(__DOXYGEN__)
-#define LWIP_GATEWAY(p)         IP4_ADDR(p, 192, 168, 1, 1)
-#endif
-
-/** @brief IP netmask. */
-#if !defined(LWIP_NETMASK) || defined(__DOXYGEN__)
-#define LWIP_NETMASK(p)         IP4_ADDR(p, 255, 255, 255, 0)
-#endif
-
-/** @brief MAC thread stack size. */
-#if !defined(LWIP_THREAD_STACK_SIZE) || defined(__DOXYGEN__)
-#define LWIP_THREAD_STACK_SIZE  512
-#endif
-
-/** @brief Transmission timeout. */
-#if !defined(LWIP_SEND_TIMEOUT) || defined(__DOXYGEN__)
-#define LWIP_SEND_TIMEOUT       50
-#endif
-
-/** @brief Link speed. */
-#if !defined(LWIP_LINK_SPEED) || defined(__DOXYGEN__)
-#define LWIP_LINK_SPEED         100000000
-#endif
-
-/** @brief MAC Address byte 0. */
-#if !defined(LWIP_ETHADDR_0) || defined(__DOXYGEN__)
-#define LWIP_ETHADDR_0          0xC2
-#endif
-
-/** @brief MAC Address byte 1. */
-#if !defined(LWIP_ETHADDR_1) || defined(__DOXYGEN__)
-#define LWIP_ETHADDR_1          0xAF
-#endif
-
-/** @brief MAC Address byte 2. */
-#if !defined(LWIP_ETHADDR_2) || defined(__DOXYGEN__)
-#define LWIP_ETHADDR_2          0x51
-#endif
-
-/** @brief MAC Address byte 3. */
-#if !defined(LWIP_ETHADDR_3) || defined(__DOXYGEN__)
-#define LWIP_ETHADDR_3          0x03
-#endif
-
-/** @brief MAC Address byte 4. */
-#if !defined(LWIP_ETHADDR_4) || defined(__DOXYGEN__)
-#define LWIP_ETHADDR_4          0xCF
-#endif
-
-/** @brief MAC Address byte 5. */
-#if !defined(LWIP_ETHADDR_5) || defined(__DOXYGEN__)
-#define LWIP_ETHADDR_5          0x46
-#endif
-
-/** @brief Interface name byte 0. */
-#if !defined(LWIP_IFNAME0) || defined(__DOXYGEN__)
-#define LWIP_IFNAME0            'm'
-#endif
-
-/** @brief Interface name byte 1. */
-#if !defined(LWIP_IFNAME1) || defined(__DOXYGEN__)
-#define LWIP_IFNAME1            's'
-#endif
-
-/**
- * @brief Runtime TCP/IP settings.
- */
-struct lwipthread_opts {
-  uint8_t       *macaddress;
-  uint32_t      address;
-  uint32_t      netmask;
-  uint32_t      gateway;
-};
-
-extern WORKING_AREA(wa_lwip_thread, LWIP_THREAD_STACK_SIZE);
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-  msg_t lwip_thread(void *p);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _LWIPTHREAD_H_ */
-
-/** @} */
diff --git a/demos/ARM7-AT91SAM7X-LWIP-GCC/main.c b/demos/ARM7-AT91SAM7X-LWIP-GCC/main.c
index ec8f7b682..882a3104b 100644
--- a/demos/ARM7-AT91SAM7X-LWIP-GCC/main.c
+++ b/demos/ARM7-AT91SAM7X-LWIP-GCC/main.c
@@ -22,7 +22,7 @@
 #include "hal.h"
 #include "test.h"
 
-#include "lwip/lwipthread.h"
+#include "lwipthread.h"
 #include "web/web.h"
 
 static WORKING_AREA(waThread1, 128);
diff --git a/os/hal/platforms/AT91SAM7/mac_lld.c b/os/hal/platforms/AT91SAM7/mac_lld.c
index 1e6852ebc..b4555194b 100644
--- a/os/hal/platforms/AT91SAM7/mac_lld.c
+++ b/os/hal/platforms/AT91SAM7/mac_lld.c
@@ -57,7 +57,7 @@
 /**
  * @brief   Ethernet driver 1.
  */
-MACDriver ETH1;
+MACDriver ETHD1;
 
 /*===========================================================================*/
 /* Driver local variables.                                                   */
@@ -100,9 +100,9 @@ static void serve_interrupt(void) {
   if ((isr & AT91C_EMAC_RCOMP) || (rsr & RSR_BITS)) {
     if (rsr & AT91C_EMAC_REC) {
       chSysLockFromIsr();
-      chSemResetI(&ETH1.rdsem, 0);
+      chSemResetI(&ETHD1.rdsem, 0);
 #if MAC_USE_EVENTS
-      chEvtBroadcastI(&ETH1.rdevent);
+      chEvtBroadcastI(&ETHD1.rdevent);
 #endif
       chSysUnlockFromIsr();
     }
@@ -112,7 +112,7 @@ static void serve_interrupt(void) {
   if ((isr & AT91C_EMAC_TCOMP) || (tsr & TSR_BITS)) {
     if (tsr & AT91C_EMAC_COMP) {
       chSysLockFromIsr();
-      chSemResetI(&ETH1.tdsem, 0);
+      chSemResetI(&ETHD1.tdsem, 0);
       chSysUnlockFromIsr();
     }
     AT91C_BASE_EMAC->EMAC_TSR = TSR_BITS;
@@ -177,12 +177,12 @@ CH_IRQ_HANDLER(irq_handler) {
 void mac_lld_init(void) {
 
   miiInit();
-  macObjectInit(&ETH1);
+  macObjectInit(&ETHD1);
 
   /*
    * Associated PHY initialization.
    */
-  miiReset(&ETH1);
+  miiReset(&ETHD1);
 
   /*
    * EMAC pins setup. Note, PB18 is not included because it is
@@ -248,8 +248,8 @@ void mac_lld_start(MACDriver *macp) {
    * PHY device identification.
    */
   AT91C_BASE_EMAC->EMAC_NCR |= AT91C_EMAC_MPE;
-  if ((miiGet(&ETH1, MII_PHYSID1) != (PHY_ID >> 16)) ||
-      ((miiGet(&ETH1, MII_PHYSID2) & 0xFFF0) != (PHY_ID & 0xFFF0)))
+  if ((miiGet(&ETHD1, MII_PHYSID1) != (PHY_ID >> 16)) ||
+      ((miiGet(&ETHD1, MII_PHYSID2) & 0xFFF0) != (PHY_ID & 0xFFF0)))
     chSysHalt();
   AT91C_BASE_EMAC->EMAC_NCR &= ~AT91C_EMAC_MPE;
 
diff --git a/os/hal/platforms/AT91SAM7/mac_lld.h b/os/hal/platforms/AT91SAM7/mac_lld.h
index 897c3cf0f..c89464ffa 100644
--- a/os/hal/platforms/AT91SAM7/mac_lld.h
+++ b/os/hal/platforms/AT91SAM7/mac_lld.h
@@ -218,7 +218,7 @@ typedef struct {
 /*===========================================================================*/
 
 #if !defined(__DOXYGEN__)
-extern MACDriver ETH1;
+extern MACDriver ETHD1;
 #endif
 
 #ifdef __cplusplus
diff --git a/readme.txt b/readme.txt
index 99a6793c7..c22d95b76 100644
--- a/readme.txt
+++ b/readme.txt
@@ -111,6 +111,7 @@
   TODO: Extensive testing.
 - CHANGE: Macros icuGetWidthI() and icuGetPeriodI() renemed to  icuGetWidth()
   and icuGetPeriod().
+- CHANGE: Renamed Ethernet driver in AT91 HAL ETHD1.
 
 *** 2.3.5 ***
 - FIX: Fixed RTC compile problem on STM32F103 (bug 3468445).