diff --git a/platform/avr-atmega128rfa1/contiki-conf.h b/platform/avr-atmega128rfa1/contiki-conf.h
index bb08df5a3..6240232d9 100644
--- a/platform/avr-atmega128rfa1/contiki-conf.h
+++ b/platform/avr-atmega128rfa1/contiki-conf.h
@@ -243,7 +243,13 @@ typedef unsigned short uip_stats_t;
 #define WITH_PHASE_OPTIMIZATION                0
 #define CONTIKIMAC_CONF_COMPOWER               1
 #define RIMESTATS_CONF_ENABLED                 1
-#define NETSTACK_CONF_FRAMER      framer_802154
+
+#if UIP_CONF_IPV6
+#define NETSTACK_CONF_FRAMER      framer802154
+#else /* UIP_CONF_IPV6 */
+#define NETSTACK_CONF_FRAMER      contikimac_framer
+#endif /* UIP_CONF_IPV6 */
+
 #define NETSTACK_CONF_RADIO       rf230_driver
 #define CHANNEL_802_15_4          26
 /* The radio needs to interrupt during an rtimer interrupt */
diff --git a/platform/avr-raven/contiki-conf.h b/platform/avr-raven/contiki-conf.h
index c6ef38eba..e921b9046 100644
--- a/platform/avr-raven/contiki-conf.h
+++ b/platform/avr-raven/contiki-conf.h
@@ -259,7 +259,13 @@ typedef unsigned short uip_stats_t;
 #define WITH_PHASE_OPTIMIZATION                0
 #define CONTIKIMAC_CONF_COMPOWER               1
 #define RIMESTATS_CONF_ENABLED                 1
-#define NETSTACK_CONF_FRAMER      framer_802154
+
+#if UIP_CONF_IPV6
+#define NETSTACK_CONF_FRAMER      framer802154
+#else /* UIP_CONF_IPV6 */
+#define NETSTACK_CONF_FRAMER      contikimac_framer
+#endif /* UIP_CONF_IPV6 */
+
 #define NETSTACK_CONF_RADIO       rf230_driver
 #define CHANNEL_802_15_4          26
 /* The radio needs to interrupt during an rtimer interrupt */
diff --git a/platform/avr-ravenusb/contiki-conf.h b/platform/avr-ravenusb/contiki-conf.h
index 9669becc9..9aae672d4 100644
--- a/platform/avr-ravenusb/contiki-conf.h
+++ b/platform/avr-ravenusb/contiki-conf.h
@@ -312,7 +312,13 @@ typedef unsigned short uip_stats_t;
 #define NETSTACK_CONF_MAC         nullmac_driver
 //#define NETSTACK_CONF_MAC         csma_driver
 #define NETSTACK_CONF_RDC         contikimac_driver
-#define NETSTACK_CONF_FRAMER      framer_802154
+
+#if UIP_CONF_IPV6
+#define NETSTACK_CONF_FRAMER      framer802154
+#else /* UIP_CONF_IPV6 */
+#define NETSTACK_CONF_FRAMER      contikimac_framer
+#endif /* UIP_CONF_IPV6 */
+
 #define NETSTACK_CONF_RADIO       rf230_driver
 #define CHANNEL_802_15_4          26
 /* Enable extended mode with autoack, but no csma/autoretry */
diff --git a/platform/cc2538dk/contiki-conf.h b/platform/cc2538dk/contiki-conf.h
index 141a62ce2..b4ace7aa3 100644
--- a/platform/cc2538dk/contiki-conf.h
+++ b/platform/cc2538dk/contiki-conf.h
@@ -316,8 +316,12 @@ typedef uint32_t rtimer_clock_t;
 #endif
 
 #ifndef NETSTACK_CONF_FRAMER
+#if UIP_CONF_IPV6
 #define NETSTACK_CONF_FRAMER  framer_802154
-#endif
+#else /* UIP_CONF_IPV6 */
+#define NETSTACK_CONF_FRAMER  contikimac_framer
+#endif /* UIP_CONF_IPV6 */
+#endif /* NETSTACK_CONF_FRAMER */
 
 #define NETSTACK_CONF_RADIO   cc2538_rf_driver
 /** @} */
diff --git a/platform/exp5438/contiki-conf.h b/platform/exp5438/contiki-conf.h
index 29901103a..b59a65c4d 100644
--- a/platform/exp5438/contiki-conf.h
+++ b/platform/exp5438/contiki-conf.h
@@ -26,7 +26,11 @@
 #endif /* NETSTACK_CONF_RADIO */
 
 #ifndef NETSTACK_CONF_FRAMER
+#if WITH_UIP6
 #define NETSTACK_CONF_FRAMER  framer_802154
+#else /* WITH_UIP6 */
+#define NETSTACK_CONF_FRAMER  contikimac_framer
+#endif /* WITH_UIP6 */
 #endif /* NETSTACK_CONF_FRAMER */
 
 #ifndef CC2420_CONF_AUTOACK
diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h
index c99645898..00aace08a 100644
--- a/platform/sky/contiki-conf.h
+++ b/platform/sky/contiki-conf.h
@@ -26,7 +26,11 @@
 #endif /* NETSTACK_CONF_RADIO */
 
 #ifndef NETSTACK_CONF_FRAMER
+#if WITH_UIP6
 #define NETSTACK_CONF_FRAMER  framer_802154
+#else /* WITH_UIP6 */
+#define NETSTACK_CONF_FRAMER  contikimac_framer
+#endif /* WITH_UIP6 */
 #endif /* NETSTACK_CONF_FRAMER */
 
 #ifndef CC2420_CONF_AUTOACK
diff --git a/platform/z1/contiki-conf.h b/platform/z1/contiki-conf.h
index 4445b53f5..129c124b0 100644
--- a/platform/z1/contiki-conf.h
+++ b/platform/z1/contiki-conf.h
@@ -69,7 +69,7 @@
 #define NETSTACK_CONF_MAC     csma_driver
 #define NETSTACK_CONF_RDC     contikimac_driver
 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
-#define NETSTACK_CONF_FRAMER  framer_802154
+#define NETSTACK_CONF_FRAMER  contikimac_framer
 
 #define CC2420_CONF_AUTOACK              1