diff --git a/core/net/rime/queuebuf.c b/core/net/rime/queuebuf.c
index c2b314d19..703154401 100644
--- a/core/net/rime/queuebuf.c
+++ b/core/net/rime/queuebuf.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: queuebuf.c,v 1.1 2007/02/28 16:38:51 adamdunkels Exp $
+ * $Id: queuebuf.c,v 1.2 2007/03/13 10:28:52 adamdunkels Exp $
  */
 
 /**
@@ -45,13 +45,13 @@
 
 struct queuebuf {
   u16_t len;
-  u8_t data[NETBUF_SIZE + NETBUF_HDR_SIZE];
+  u8_t data[RIMEBUF_SIZE + RIMEBUF_HDR_SIZE];
 };
 
 struct queuebuf_ref {
   u16_t len;
   u8_t *ref;
-  u8_t hdr[NETBUF_HDR_SIZE];
+  u8_t hdr[RIMEBUF_HDR_SIZE];
   u8_t hdrlen;
 };
 
@@ -74,7 +74,7 @@ queuebuf_new_from_rimebuf(void)
   if(rimebuf_is_reference()) {
     rbuf = memb_alloc(&refbufmem);
     if(rbuf != NULL) {
-      rbuf->len = rimebuf_len();
+      rbuf->len = rimebuf_datalen();
       rbuf->ref = rimebuf_reference_ptr();
       rbuf->hdrlen = rimebuf_copyto_hdr(rbuf->hdr);
     }