diff --git a/core/net/uip.c b/core/net/uip.c
index 59e4d8fb4..e808b1e70 100644
--- a/core/net/uip.c
+++ b/core/net/uip.c
@@ -41,7 +41,7 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip.c,v 1.28 2010/05/24 10:07:34 joxe Exp $
+ * $Id: uip.c,v 1.29 2010/05/30 09:46:12 oliverschmidt Exp $
  *
  */
 
@@ -127,11 +127,7 @@ struct uip_eth_addr uip_ethaddr = {{0,0,0,0,0,0}};
 #endif
 
 /* The packet buffer that contains incoming packets. */
-#ifdef UIP_CONF_PLAIN_BUFFER
-uint8_t uip_buf[UIP_BUFSIZE + 2];
-#else /* UIP_CONF_PLAIN_BUFFER */
 uip_buf_t uip_aligned_buf;
-#endif /* UIP_CONF_PLAIN_BUFFER */
 
 void *uip_appdata;               /* The uip_appdata pointer points to
 				    application data. */
diff --git a/core/net/uip.h b/core/net/uip.h
index 0ea01c24f..6629e9a25 100644
--- a/core/net/uip.h
+++ b/core/net/uip.h
@@ -47,7 +47,7 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip.h,v 1.33 2010/05/24 10:07:34 joxe Exp $
+ * $Id: uip.h,v 1.34 2010/05/30 09:46:12 oliverschmidt Exp $
  *
  */
 
@@ -482,12 +482,8 @@ typedef union {
   uint8_t u8[UIP_BUFSIZE];
 } uip_buf_t;
 
-#ifdef UIP_CONF_PLAIN_BUFFER
-CCIF extern uint8_t uip_buf[UIP_BUFSIZE+2];
-#else /* UIP_CONF_PLAIN_BUFFER */
 CCIF extern uip_buf_t uip_aligned_buf;
 #define uip_buf (uip_aligned_buf.u8)
-#endif /* UIP_CONF_PLAIN_BUFFER */
 
 
 /** @} */
diff --git a/cpu/6502/6502def.h b/cpu/6502/6502def.h
index 17dd3b650..b4e93be9f 100644
--- a/cpu/6502/6502def.h
+++ b/cpu/6502/6502def.h
@@ -30,7 +30,7 @@
  *
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * @(#)$Id: 6502def.h,v 1.24 2010/05/08 07:25:10 oliverschmidt Exp $
+ * @(#)$Id: 6502def.h,v 1.25 2010/05/30 09:46:12 oliverschmidt Exp $
  */
 
 #ifndef __6502DEF_H__
@@ -72,8 +72,6 @@ typedef unsigned short uip_stats_t;
 
 #define LOADER_CONF_ARCH "lib/unload.h"
 
-#define UIP_CONF_PLAIN_BUFFER 1
-
 #if MTU_SIZE
 #define UIP_CONF_BUFFER_SIZE (UIP_LLH_LEN + MTU_SIZE)
 #else /* MTU_SIZE */