diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c b/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c
index 2c30aeb78..50e855eb9 100644
--- a/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c
+++ b/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c
@@ -50,7 +50,7 @@ static const MACConfig mac_config = {macaddr.addr};
 static void network_device_send(void) {
   MACTransmitDescriptor td;
 
-  if (macWaitTransmitDescriptor(&ETH1, &td, MS2ST(SEND_TIMEOUT)) == RDY_OK) {
+  if (macWaitTransmitDescriptor(&ETHD1, &td, MS2ST(SEND_TIMEOUT)) == RDY_OK) {
     if(uip_len <= UIP_LLH_LEN + UIP_TCPIP_HLEN)
       macWriteTransmitDescriptor(&td, uip_buf, uip_len);
     else {
@@ -70,7 +70,7 @@ static size_t network_device_read(void) {
   MACReceiveDescriptor rd;
   size_t size;
 
-  if (macWaitReceiveDescriptor(&ETH1, &rd, TIME_IMMEDIATE) != RDY_OK)
+  if (macWaitReceiveDescriptor(&ETHD1, &rd, TIME_IMMEDIATE) != RDY_OK)
     return 0;
   size = rd.size;
   macReadReceiveDescriptor(&rd, uip_buf, size);
@@ -107,7 +107,7 @@ static void PeriodicTimerHandler(eventid_t id) {
 static void ARPTimerHandler(eventid_t id) {
 
   (void)id;
-  (void)macPollLinkStatus(&ETH1);
+  (void)macPollLinkStatus(&ETHD1);
   uip_arp_timer();
 }
 
@@ -154,7 +154,7 @@ msg_t WebThread(void *p) {
   /*
    * Event sources setup.
    */
-  chEvtRegister(macGetReceiveEventSource(&ETH1), &el0, FRAME_RECEIVED_ID);
+  chEvtRegister(macGetReceiveEventSource(&ETHD1), &el0, FRAME_RECEIVED_ID);
   chEvtAddFlags(EVENT_MASK(FRAME_RECEIVED_ID)); /* In case some frames are already buffered */
 
   evtInit(&evt1, MS2ST(500));
@@ -168,8 +168,8 @@ msg_t WebThread(void *p) {
   /*
    * EMAC driver start.
    */
-  macStart(&ETH1, &mac_config);
-  (void)macPollLinkStatus(&ETH1);
+  macStart(&ETHD1, &mac_config);
+  (void)macPollLinkStatus(&ETHD1);
 
   /*
    * uIP initialization.
diff --git a/demos/ARMCM3-STM32F107-FATFS/Makefile b/demos/ARMCM3-STM32F107-FATFS/Makefile
index f5dc94fa1..e3a7d620b 100644
--- a/demos/ARMCM3-STM32F107-FATFS/Makefile
+++ b/demos/ARMCM3-STM32F107-FATFS/Makefile
@@ -60,7 +60,7 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P107/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform_f105_f107.mk
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
diff --git a/demos/ARMCM3-STM32F107-FATFS/mcuconf.h b/demos/ARMCM3-STM32F107-FATFS/mcuconf.h
index cb9c1e8e2..a60eb7af8 100644
--- a/demos/ARMCM3-STM32F107-FATFS/mcuconf.h
+++ b/demos/ARMCM3-STM32F107-FATFS/mcuconf.h
@@ -203,7 +203,7 @@
 /*
  * USB driver system settings.
  */
-#define STM32_USB_USE_OTG1                  TRUE
+#define STM32_USB_USE_OTG1                  FALSE
 #define STM32_USB_OTG1_IRQ_PRIORITY         14
 #define STM32_USB_OTG1_RX_FIFO_SIZE         512
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
diff --git a/demos/ARMCM3-STM32F107-LWIP/Makefile b/demos/ARMCM3-STM32F107-LWIP/Makefile
index 28772cfa8..1f2572313 100644
--- a/demos/ARMCM3-STM32F107-LWIP/Makefile
+++ b/demos/ARMCM3-STM32F107-LWIP/Makefile
@@ -60,7 +60,7 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P107/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform_f105_f107.mk
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
diff --git a/demos/ARMCM3-STM32F107-LWIP/mcuconf.h b/demos/ARMCM3-STM32F107-LWIP/mcuconf.h
index 02d7ed345..662f107de 100644
--- a/demos/ARMCM3-STM32F107-LWIP/mcuconf.h
+++ b/demos/ARMCM3-STM32F107-LWIP/mcuconf.h
@@ -203,7 +203,7 @@
 /*
  * USB driver system settings.
  */
-#define STM32_USB_USE_OTG1                  TRUE
+#define STM32_USB_USE_OTG1                  FALSE
 #define STM32_USB_OTG1_IRQ_PRIORITY         14
 #define STM32_USB_OTG1_RX_FIFO_SIZE         512
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO
diff --git a/demos/ARMCM3-STM32F107/Makefile b/demos/ARMCM3-STM32F107/Makefile
index 75521eb30..4d5d48b63 100644
--- a/demos/ARMCM3-STM32F107/Makefile
+++ b/demos/ARMCM3-STM32F107/Makefile
@@ -60,7 +60,7 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P107/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform_f105_f107.mk
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
diff --git a/demos/ARMCM3-STM32F107/mcuconf.h b/demos/ARMCM3-STM32F107/mcuconf.h
index 02d7ed345..662f107de 100644
--- a/demos/ARMCM3-STM32F107/mcuconf.h
+++ b/demos/ARMCM3-STM32F107/mcuconf.h
@@ -203,7 +203,7 @@
 /*
  * USB driver system settings.
  */
-#define STM32_USB_USE_OTG1                  TRUE
+#define STM32_USB_USE_OTG1                  FALSE
 #define STM32_USB_OTG1_IRQ_PRIORITY         14
 #define STM32_USB_OTG1_RX_FIFO_SIZE         512
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO