diff --git a/include/osmocore/msgb.h b/include/osmocore/msgb.h
index 61c224f..2841dc5 100644
--- a/include/osmocore/msgb.h
+++ b/include/osmocore/msgb.h
@@ -27,6 +27,7 @@
 	struct llist_head list;
 
 	/* Part of which TRX logical channel we were received / transmitted */
+	/* FIXME: move them into the control buffer */
 	struct gsm_bts_trx *trx;
 	struct gsm_lchan *lchan;
 
@@ -39,6 +40,9 @@
 	/* the layer 4 header */
 	unsigned char *l4h;
 
+	/* the 'control buffer', large enough to contain 5 pointers */
+	unsigned long cb[5];
+
 	uint16_t data_len;
 	uint16_t len;