diff --git a/plugins/channelrx/udpsrc/udpsrc.cpp b/plugins/channelrx/udpsrc/udpsrc.cpp
index f015f6d09..254920d32 100644
--- a/plugins/channelrx/udpsrc/udpsrc.cpp
+++ b/plugins/channelrx/udpsrc/udpsrc.cpp
@@ -39,8 +39,8 @@ UDPSrc::UDPSrc(MessageQueue* uiMessageQueue, UDPSrcGUI* udpSrcGUI, BasebandSampl
 {
 	setObjectName("UDPSrc");
 
-	m_udpBuffer = new UDPSink<Sample>(this, udpBLockSampleSize, m_udpPort);
-	m_udpBufferMono = new UDPSink<FixReal>(this, udpBLockSampleSize, m_udpPort);
+	m_udpBuffer = new UDPSink<Sample>(this, udpBlockSize, m_udpPort);
+	m_udpBufferMono = new UDPSink<FixReal>(this, udpBlockSize, m_udpPort);
 	m_audioSocket = new QUdpSocket(this);
 	m_udpAudioBuf = new char[m_udpAudioPayloadSize];
 
@@ -67,7 +67,7 @@ UDPSrc::UDPSrc(MessageQueue* uiMessageQueue, UDPSrcGUI* udpSrcGUI, BasebandSampl
 	m_scale = 0;
 	m_boost = 0;
 	m_magsq = 0;
-	UDPFilter = new fftfilt(0.0, (m_rfBandwidth / 2.0) / m_outputSampleRate, udpBLockSampleSize);
+	UDPFilter = new fftfilt(0.0, (m_rfBandwidth / 2.0) / m_outputSampleRate, udpBlockSize);
 
 	m_phaseDiscri.setFMScaling((float) m_outputSampleRate / (2.0f * m_fmDeviation));
 
diff --git a/plugins/channelrx/udpsrc/udpsrc.h b/plugins/channelrx/udpsrc/udpsrc.h
index 699258234..9403b552e 100644
--- a/plugins/channelrx/udpsrc/udpsrc.h
+++ b/plugins/channelrx/udpsrc/udpsrc.h
@@ -80,7 +80,7 @@ public:
 	virtual void stop();
 	virtual bool handleMessage(const Message& cmd);
 
-	static const int udpBLockSampleSize = 512; // UDP block size in number of samples
+	static const int udpBlockSize = 512; // UDP block size in number of bytes
 
 public slots:
     void audioReadyRead();
diff --git a/plugins/channeltx/udpsink/CMakeLists.txt b/plugins/channeltx/udpsink/CMakeLists.txt
index e61c73f0f..3b35aaf2d 100644
--- a/plugins/channeltx/udpsink/CMakeLists.txt
+++ b/plugins/channeltx/udpsink/CMakeLists.txt
@@ -4,12 +4,14 @@ set(udpsink_SOURCES
 	udpsink.cpp
 	udpsinkgui.cpp
 	udpsinkplugin.cpp
+	udpsinkudphandler.cpp
 )
 
 set(udpsink_HEADERS
 	udpsink.h
 	udpsinkgui.h
 	udpsinkplugin.h
+	udpsinkudphandler.h
 )
 
 set(udpsink_FORMS