diff --git a/src/mididevice.cpp b/src/mididevice.cpp
index c3210cc..df9b500 100644
--- a/src/mididevice.cpp
+++ b/src/mididevice.cpp
@@ -87,6 +87,11 @@ void CMIDIDevice::MIDIMessageHandler (const u8 *pMessage, size_t nLength, unsign
 	// The packet contents are just normal MIDI data - see
 	// https://www.midi.org/specifications/item/table-1-summary-of-midi-message
 
+			for (uint16_t i = 0; i < nLength; i++)
+			{
+				printf(">>> 0x%02x\n",pMessage[i]);
+			}
+
 	if (m_pConfig->GetMIDIDumpEnabled ())
 	{
 		switch (nLength)
@@ -118,14 +123,16 @@ void CMIDIDevice::MIDIMessageHandler (const u8 *pMessage, size_t nLength, unsign
 					for (uint16_t i = 0; i < nLength; i++)
 					{
 						if((i % 8) == 0)
-							printf("%04d: ",i);
-						printf("0x%02x",pMessage[i]);
+							printf("%04d:",i);
+						printf(" 0x%02x",pMessage[i]);
 						if((i % 8) == 0)
 							printf("\n");
 					}
 					break;
+				default:
+					printf("Unhandled MIDI event type %0x02x\n",pMessage[0]);
 			}
-
+			break;
 		}
 	}
 
@@ -155,7 +162,7 @@ void CMIDIDevice::MIDIMessageHandler (const u8 *pMessage, size_t nLength, unsign
 	{
 		float32_t nMasterVolume=(pMessage[5] & (pMessage[6]<<7))/(1<<14);
 		LOGNOTE("Master volume: %f",nMasterVolume);
-		; // Handle global master volume
+		// TODO: Handle global master volume
 	}
 	else
 	{
diff --git a/src/serialmididevice.cpp b/src/serialmididevice.cpp
index b03dfad..6a7ff1c 100644
--- a/src/serialmididevice.cpp
+++ b/src/serialmididevice.cpp
@@ -20,6 +20,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
+#include <cstring>
 #include "serialmididevice.h"
 #include <assert.h>
 
@@ -29,6 +30,7 @@ CSerialMIDIDevice::CSerialMIDIDevice (CMiniDexed *pSynthesizer, CInterruptSystem
 	m_pConfig (pConfig),
 	m_Serial (pInterrupt, TRUE),
 	m_nSerialState (0),
+	m_nSysEx (0),
 	m_SendBuffer (&m_Serial)
 {
 	AddDevice ("ttyS1");
@@ -57,6 +59,14 @@ void CSerialMIDIDevice::Process (void)
 		return;
 	}
 
+	if(Buffer[0] == 0xF0)
+	{
+		// SYSEX found
+		m_nSysEx=nResult;
+		memcpy(m_SerialMessage, Buffer, nResult);
+		return;
+	}
+
 	// Process MIDI messages
 	// See: https://www.midi.org/specifications/item/table-1-summary-of-midi-message
 	// "Running status" see: https://www.lim.di.unimi.it/IEEE/MIDI/SOT5.HTM#Running-	
@@ -65,54 +75,63 @@ void CSerialMIDIDevice::Process (void)
 	{
 		u8 uchData = Buffer[i];
 
-		switch (m_nSerialState)
+		if(m_nSysEx > 0)
 		{
-		case 0:
-		MIDIRestart:
-			if (   (uchData & 0x80) == 0x80		// status byte, all channels
-			    && (uchData & 0xF0) != 0xF0)	// ignore system messages
-			{
-				m_SerialMessage[m_nSerialState++] = uchData;
-			}
-			break;
-
-		case 1:
-		case 2:
-		DATABytes:
-			if (uchData & 0x80)			// got status when parameter expected
-			{
-				m_nSerialState = 0;
-
-				goto MIDIRestart;
-			}
-
-			m_SerialMessage[m_nSerialState++] = uchData;
-
-			if (   (m_SerialMessage[0] & 0xE0) == 0xC0
-			    || m_nSerialState == 3)		// message is complete
+			m_SerialMessage[m_nSysEx++]=uchData;
+			if ((uchData & 0x80) == 0x80 || m_nSysEx >= MAX_MIDI_MESSAGE)
 			{
-				MIDIMessageHandler (m_SerialMessage, m_nSerialState);
-
-				m_nSerialState = 4; // State 4 for test if 4th byte is a status byte or a data byte 
-			}
-			break;
-		case 4:
-			
-			if ((uchData & 0x80) == 0)  // true data byte, false status byte
-			{
-				m_nSerialState = 1;
-				goto DATABytes;
+				if(uchData == 0xF7)
+					MIDIMessageHandler (m_SerialMessage, m_nSysEx);
+				m_nSysEx = 0;
 			}
-			else 
+			continue;
+		}
+		else
+		{
+			switch (m_nSerialState)
 			{
-				m_nSerialState = 0;
-				goto MIDIRestart; 
+			case 0:
+			MIDIRestart:
+				if (   (uchData & 0x80) == 0x80		// status byte, all channels
+				    && (uchData & 0xF0) != 0xF0)	// ignore system messages
+				{
+					m_SerialMessage[m_nSerialState++] = uchData;
+				}
+				break;
+	
+			case 1:
+			case 2:
+			DATABytes:
+				if (uchData & 0x80)			// got status when parameter expected
+				{
+					m_nSerialState = 0;
+	
+					goto MIDIRestart;
+				}
+	
+				m_SerialMessage[m_nSerialState++] = uchData;
+	
+				if (   (m_SerialMessage[0] & 0xE0) == 0xC0
+				    || m_nSerialState == 3)		// message is complete
+				{
+					MIDIMessageHandler (m_SerialMessage, m_nSerialState);
+	
+					m_nSerialState = 4; // State 4 for test if 4th byte is a status byte or a data byte 
+				}
+	
+				break;
+			case 4:
+				
+				if ((uchData & 0x80) == 0)  // true data byte, false status byte
+				{
+					m_nSerialState = 1;
+					goto DATABytes;
+				}
+				break;
+			default:
+				assert (0);
+				break;
 			}
-			break;
-
-		default:
-			assert (0);
-			break;
 		}
 	}
 }
diff --git a/src/serialmididevice.h b/src/serialmididevice.h
index 0e6d9f5..1f3619e 100644
--- a/src/serialmididevice.h
+++ b/src/serialmididevice.h
@@ -30,6 +30,9 @@
 #include <circle/writebuffer.h>
 #include <circle/types.h>
 
+#define MAX_DX7_SYSEX_LENGTH 4104
+#define MAX_MIDI_MESSAGE MAX_DX7_SYSEX_LENGTH
+
 class CMiniDexed;
 
 class CSerialMIDIDevice : public CMIDIDevice
@@ -49,7 +52,8 @@ private:
 
 	CSerialDevice m_Serial;
 	unsigned m_nSerialState;
-	u8 m_SerialMessage[3];
+	unsigned m_nSysEx;
+	u8 m_SerialMessage[MAX_MIDI_MESSAGE];
 
 	CWriteBufferDevice m_SendBuffer;
 };