diff --git a/src/locationinfo/AprsTcpClient.cpp b/src/locationinfo/AprsTcpClient.cpp
index 10bf28e6..10709467 100644
--- a/src/locationinfo/AprsTcpClient.cpp
+++ b/src/locationinfo/AprsTcpClient.cpp
@@ -210,7 +210,7 @@ void AprsTcpClient::updateQsoStatus(int action, const string& call,
 // updates state of a 3rd party
 void AprsTcpClient::update3rdState(const string& call, const string& info)
 {
-   char aprsmsg[200];
+   char aprsmsg[20 + info.length()];
    sprintf(aprsmsg, "%s>%s\n\r", call.c_str(), info.c_str());
    sendMsg(aprsmsg);
 } /* AprsTcpClient::update3rdState */
@@ -268,7 +268,7 @@ void AprsTcpClient::sendAprsBeacon(Timer *t)
   sprintf(tone, (loc_cfg.tone < 1000) ? "T%03d" : "%04d", loc_cfg.tone);
 
     // APRS message
-  char aprsmsg[200];
+  char aprsmsg[150 + loc_cfg.comment.length()];
   sprintf(aprsmsg, "%s>%s,%s:;%s%-6.6s*111111z%s%03d.%03dMHz %s R%02d%c %s\r\n",
             el_call.c_str(), destination.c_str(), loc_cfg.path.c_str(),
             el_prefix.c_str(), el_call.c_str(), pos, loc_cfg.frequency / 1000,
diff --git a/src/svxlink/ChangeLog b/src/svxlink/ChangeLog
index 5dfdb71d..d6a28a05 100644
--- a/src/svxlink/ChangeLog
+++ b/src/svxlink/ChangeLog
@@ -32,6 +32,7 @@
 
 * ModuleMetarInfo bugfix: Announcing twice
 
+* ModuleMetarInfo bugfix: SvxLink crashed on long LocationInfo comments
 
 
  1.7.0 -- 01 Sep 2019
diff --git a/src/versions b/src/versions
index 4ffa8c33..3cb2dd35 100644
--- a/src/versions
+++ b/src/versions
@@ -20,7 +20,7 @@ MODULE_PROPAGATION_MONITOR=1.0.1
 MODULE_TCL_VOICE_MAIL=1.0.2
 MODULE_SELCALLENC=1.0.0
 MODULE_DTMF_REPEATER=1.0.2
-MODULE_METAR_INFO=1.2.1.99.0
+MODULE_METAR_INFO=1.2.1.99.1
 MODULE_FRN=1.1.0
 MODULE_TRX=1.0.0