diff --git a/OLED.cpp b/OLED.cpp
index 6a2043a..e315242 100644
--- a/OLED.cpp
+++ b/OLED.cpp
@@ -148,6 +148,28 @@ const unsigned char logo_NXDN_bmp [] =
 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
 };
 
+// Logo M17_sm, 128x16px
+// XXX FIXME This is the NXDN logo, it needs replacing with the M17 logo
+const unsigned char logo_M17_bmp [] =
+{
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+0xff, 0xf0, 0x1f, 0xf8, 0x0f, 0x00, 0xff, 0x80, 0x7c, 0x00, 0x0f, 0xff, 0x80, 0x7f, 0xe0, 0x7f,
+0xff, 0xe0, 0x0f, 0xf0, 0x1f, 0x80, 0x7e, 0x01, 0xf8, 0x00, 0x00, 0x7f, 0x00, 0x3f, 0xc0, 0x7f,
+0xff, 0xc0, 0x07, 0xe0, 0x3f, 0x80, 0x38, 0x07, 0xf0, 0x00, 0x00, 0x3e, 0x00, 0x3f, 0x80, 0xff,
+0xff, 0x80, 0x03, 0xc0, 0x3f, 0xc0, 0x00, 0x3f, 0xe0, 0x1f, 0x80, 0x3e, 0x00, 0x1f, 0x01, 0xff,
+0xff, 0x00, 0x03, 0x80, 0x7f, 0xe0, 0x00, 0xff, 0xc0, 0x3f, 0x80, 0x3c, 0x00, 0x0e, 0x03, 0xff,
+0xfe, 0x00, 0x01, 0x00, 0xff, 0xe0, 0x03, 0xff, 0x80, 0x7f, 0x80, 0x78, 0x08, 0x04, 0x03, 0xff,
+0xfc, 0x03, 0x00, 0x01, 0xff, 0x80, 0x01, 0xff, 0x00, 0xff, 0x00, 0xf0, 0x1c, 0x00, 0x07, 0xff,
+0xfc, 0x07, 0x80, 0x03, 0xfc, 0x00, 0x01, 0xfe, 0x01, 0xfc, 0x01, 0xe0, 0x1e, 0x00, 0x0f, 0xff,
+0xf8, 0x0f, 0xc0, 0x07, 0xf0, 0x0e, 0x00, 0xfc, 0x00, 0x00, 0x07, 0xc0, 0x3f, 0x00, 0x1f, 0xff,
+0xf0, 0x1f, 0xe0, 0x0f, 0x80, 0x3f, 0x00, 0x7c, 0x00, 0x00, 0x3f, 0xc0, 0x7f, 0x80, 0x3f, 0xff,
+0xe0, 0x3f, 0xf0, 0x0e, 0x01, 0xff, 0x80, 0x38, 0x00, 0x07, 0xff, 0x80, 0xff, 0x80, 0x7f, 0xff,
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+};
+
 // Logo POCASG/DAPNET, 128x16px
 const unsigned char logo_POCSAG_bmp [] =
 {
@@ -346,7 +368,6 @@ void COLED::writeDStarInt(const char* my1, const char* my2, const char* your, co
 
     OLED_statusbar();
     m_display.display();
-
 }
 
 void COLED::clearDStarInt()
@@ -572,10 +593,10 @@ void COLED::writeM17Int(const char* source, const char* dest, const char* type)
     m_display.clearDisplay();
     m_display.fillRect(0, OLED_LINE2, m_display.width(), m_display.height(), BLACK);
 
-    m_display.setCursor(0, OLED_LINE3);
-    m_display.printf("%s %.10s", type, source);
+    m_display.setCursor(0,OLED_LINE3);
+    m_display.printf("%s %s", type, source);
 
-    m_display.setCursor(0, OLED_LINE4);
+    m_display.setCursor(0,OLED_LINE4);
     m_display.printf("  %s", dest);
 
     OLED_statusbar();
diff --git a/OLED.h b/OLED.h
index 45c78ad..a7ab811 100644
--- a/OLED.h
+++ b/OLED.h
@@ -66,6 +66,9 @@ public:
   virtual void writeP25Int(const char* source, bool group, unsigned int dest, const char* type);
   virtual void clearP25Int();
 
+  virtual void writeM17Int(const char* source, const char* dest, const char* type);
+  virtual void clearM17Int();
+
   virtual void writeNXDNInt(const char* source, bool group, unsigned int dest, const char* type);
   virtual int writeNXDNIntEx(const class CUserDBentry& source, bool group, unsigned int dest, const char* type);
   virtual void clearNXDNInt();
diff --git a/Version.h b/Version.h
index 6434cb8..619f66b 100644
--- a/Version.h
+++ b/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20201115";
+const char* VERSION = "20201117";
 
 #endif