diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 35f1f588..c8aeb292 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -1611,7 +1611,7 @@ bgp_shutdown(struct proto *P)
   if (message)
   {
     uint msg_len = strlen(message);
-    msg_len = MIN(msg_len, 128);
+    msg_len = MIN(msg_len, 255);
 
     /* Buffer will be freed automatically by protocol shutdown */
     data = mb_alloc(p->p.pool, msg_len + 1);
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index d348ebc1..c7cc1d01 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -2893,7 +2893,7 @@ bgp_handle_message(struct bgp_proto *p, byte *data, uint len, byte **bp)
     return 1;
 
   /* Handle proper message */
-  if ((msg_len > 128) && (msg_len + 1 > len))
+  if ((msg_len > 255) && (msg_len + 1 > len))
     return 0;
 
   /* Some elementary cleanup */