diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h
index 35e7a8e30..a1345c388 100644
--- a/include/osmocom/gsm/gsm0808.h
+++ b/include/osmocom/gsm/gsm0808.h
@@ -29,8 +29,8 @@
 #include <osmocom/gsm/gsm23003.h>
 #include <osmocom/core/utils.h>
 
-#define BSSMAP_MSG_SIZE 512
-#define BSSMAP_MSG_HEADROOM 128
+#define BSSMAP_MSG_SIZE 1024
+#define BSSMAP_MSG_HEADROOM 512
 
 struct sockaddr_storage;