diff --git a/kiss_processor.cpp b/kiss_processor.cpp
index 466f55d..f67ff2d 100644
--- a/kiss_processor.cpp
+++ b/kiss_processor.cpp
@@ -17,9 +17,17 @@ void Processor::sendRigToSerial(Cmd cmd, const byte *packet, int packetLength) {
   if (disableKiss_) {
     for (int i = 0; i < packetLength; i++) {
       byte rxByte = packet[i];
-      onSerialTx(rxByte);
+      // TNC2 splits on \n
+      if (rxByte == '\0') {
+        onSerialTx('\n');
+      } else {
+        onSerialTx(rxByte);
+      }
+      // append \n for TNC2 compatibility if not there
+      if (rxByte != '\n' && rxByte != '\0' && i == packetLength - 1) {
+        onSerialTx('\n');
+      }
     }
-    // FIXME, need to check if '\0' or '\n' should be added
   } else {
     onSerialTx((byte)Marker::Fend);
     onSerialTx((byte)cmd);
@@ -60,11 +68,11 @@ void ICACHE_RAM_ATTR Processor::queueRigToSerialIsr(Cmd cmd, const byte *packet,
 void Processor::queueSerialToRig(Cmd cmd, const byte *packet, int packetLength) {
   bool result = 1;
   if (disableKiss_) {
+    // TNC2, send as is, receiveByteRaw will deal with it
     for (int i = 0; i < packetLength; i++) {
       byte rxByte = packet[i];
       result &= serialToRigQueue_.unshift(rxByte);
     }
-    // FIXME, need to check if '\0' or '\n' should be added
   } else {
     result &= serialToRigQueue_.unshift(Marker::Fend);
     result &= serialToRigQueue_.unshift(cmd);
@@ -214,15 +222,16 @@ bool Processor::receiveByteRaw(byte rxByte)
     isRawIdle_ = false;
   }
   onRigTx(rxByte);
-  // FIXME, need to check if '\n' is marker too
-  if (rxByte == '\0') {
+  // NOTE, TNC2 uses \n as a packet delimiter
+  if (rxByte == '\n') {
+    onRigTx('\0');
     onRigTxEnd();
     isRawIdle_ = true;
   }
   return true;
 }
 
-bool Processor::receiveByteKiss(byte rxByte) 
+bool Processor::receiveByteKiss(byte rxByte)
 {
   switch (state_) {
     case State::GetStart:
diff --git a/loraprs_service.cpp b/loraprs_service.cpp
index 114e0ab..322d536 100644
--- a/loraprs_service.cpp
+++ b/loraprs_service.cpp
@@ -44,6 +44,7 @@ void Service::setup(const Config &conf)
 #else
   LOG_INFO("Built with arduino-LoRa library");
 #endif
+  LOG_INFO(disableKiss_ ? "Using TNC2 text mode" : "Using TNC KISS and AX.25 mode");
 
   ownCallsign_ = AX25::Callsign(config_.AprsLogin);
   if (!ownCallsign_.IsValid()) {
diff --git a/loraprs_service.h b/loraprs_service.h
index bf695b5..dd94a94 100644
--- a/loraprs_service.h
+++ b/loraprs_service.h
@@ -140,7 +140,7 @@ private:
 
   // state
   long previousBeaconMs_;
-    
+
   // peripherals
   static byte rxBuf_[256];
 #ifdef USE_RADIOLIB