diff --git a/include/osmocom/mgcp/mgcp_common.h b/include/osmocom/mgcp/mgcp_common.h
index 7aa5d3f..d23339f 100644
--- a/include/osmocom/mgcp/mgcp_common.h
+++ b/include/osmocom/mgcp/mgcp_common.h
@@ -68,6 +68,9 @@
 	return 0;
 }
 
+/* Maximum length of the comment field */
+#define MGCP_COMMENT_MAXLEN 256
+
 /* String length of Connection Identifiers
  * (see also RFC3435 2.1.3.2 Names of Connections) */
 #define MGCP_CONN_ID_LENGTH 32+1
diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h
index 676850f..73f3bba 100644
--- a/include/osmocom/mgcp_client/mgcp_client.h
+++ b/include/osmocom/mgcp_client/mgcp_client.h
@@ -29,7 +29,7 @@
 struct mgcp_response_head {
 	int response_code;
 	mgcp_trans_id_t trans_id;
-	const char *comment;
+	char comment[MGCP_COMMENT_MAXLEN];
 	char conn_id[MGCP_CONN_ID_LENGTH];
 	char endpoint[MGCP_ENDPOINT_MAXLEN];
 };