diff --git a/plugins/samplesink/sdrdaemonsink/CMakeLists.txt b/plugins/samplesink/sdrdaemonsink/CMakeLists.txt
index 3223c8ea0..71169dd28 100644
--- a/plugins/samplesink/sdrdaemonsink/CMakeLists.txt
+++ b/plugins/samplesink/sdrdaemonsink/CMakeLists.txt
@@ -16,9 +16,9 @@ set(sdrdaemonsink_HEADERS
 #	sdrdaemonsinkthread.h
 )
 
-#set(sdrdaemonsink_FORMS
-#	sdrdaemonsinkgui.ui
-#)
+set(sdrdaemonsink_FORMS
+	sdrdaemonsinkgui.ui
+)
 
 include_directories(
 	.
@@ -29,7 +29,7 @@ add_definitions(${QT_DEFINITIONS})
 add_definitions(-DQT_PLUGIN)
 add_definitions(-DQT_SHARED)
 
-#qt5_wrap_ui(sdrdaemonsink_FORMS_HEADERS ${sdrdaemonsink_FORMS})
+qt5_wrap_ui(sdrdaemonsink_FORMS_HEADERS ${sdrdaemonsink_FORMS})
 
 add_library(outputsdrdaemonsink SHARED
 	${sdrdaemonsink_SOURCES}
diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsink.pro b/plugins/samplesink/sdrdaemonsink/sdrdaemonsink.pro
index 7420ff0a7..973a9651c 100644
--- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsink.pro
+++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsink.pro
@@ -47,7 +47,7 @@ HEADERS += sdrdaemonsinksettings.h
 #	sdrdaemonsinksettings.h\
 #	sdrdaemonsinkthread.h
 
-#FORMS += sdrdaemonsinkgui.ui
+FORMS += sdrdaemonsinkgui.ui
 
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../devices/$${build_subdir} -ldevices
diff --git a/plugins/samplesink/sdrdaemonsink/filesinkgui.ui b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui
similarity index 75%
rename from plugins/samplesink/sdrdaemonsink/filesinkgui.ui
rename to plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui
index 8def6a752..081e93068 100644
--- a/plugins/samplesink/sdrdaemonsink/filesinkgui.ui
+++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>FileSinkGui</class>
- <widget class="QWidget" name="FileSinkGui">
+ <class>SDRdaemonSinkGui</class>
+ <widget class="QWidget" name="SDRdaemonSinkGui">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>350</width>
+    <width>372</width>
     <height>190</height>
    </rect>
   </property>
@@ -18,7 +18,7 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>350</width>
+    <width>372</width>
     <height>190</height>
    </size>
   </property>
@@ -174,58 +174,44 @@
    <item>
     <layout class="QHBoxLayout" name="fileSelectionLayout">
      <item>
-      <widget class="QPushButton" name="showFileDialog">
-       <property name="minimumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Open file</string>
-       </property>
+      <widget class="QLabel" name="sampleRateLabel">
        <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="../../../sdrbase/resources/res.qrc">
-         <normaloff>:/preset-load.png</normaloff>:/preset-load.png</iconset>
+        <string>SR</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="fileNameText">
-       <property name="enabled">
-        <bool>false</bool>
+      <widget class="ValueDial" name="sampleRate" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>32</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <family>Monospace</family>
+         <pointsize>12</pointsize>
+        </font>
        </property>
        <property name="toolTip">
-        <string>File currently opened</string>
-       </property>
-       <property name="text">
-        <string>...</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <string>Remote device sample rate</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="sampleRateUnit">
+       <property name="text">
+        <string>S/s</string>
        </property>
       </widget>
      </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="Line" name="line_rate">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="rateControlLayout">
      <item>
       <widget class="QLabel" name="interpLabel">
        <property name="text">
@@ -276,38 +262,58 @@
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="sampleRateLabel">
-       <property name="text">
-        <string>SR</string>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="ValueDial" name="sampleRate" native="true">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
+       <property name="sizeHint" stdset="0">
         <size>
-         <width>32</width>
-         <height>16</height>
+         <width>40</width>
+         <height>20</height>
         </size>
        </property>
-       <property name="font">
-        <font>
-         <family>DejaVu Sans Mono</family>
-         <pointsize>12</pointsize>
-        </font>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="Line" name="line_rate">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="rateControlLayout">
+     <item>
+      <widget class="QDial" name="nbFECBlocks">
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximum">
+        <number>32</number>
+       </property>
+       <property name="pageStep">
+        <number>1</number>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="sampleRateUnit">
+      <widget class="QLabel" name="nominalNbBlocksText">
+       <property name="minimumSize">
+        <size>
+         <width>50</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="text">
-        <string>S/s</string>
+        <string>000/000</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
@@ -325,7 +331,7 @@
       </spacer>
      </item>
      <item>
-      <widget class="QLabel" name="relTimeText">
+      <widget class="QLabel" name="absTimeText">
        <property name="enabled">
         <bool>false</bool>
        </property>
@@ -339,7 +345,54 @@
         <string>Record time from start</string>
        </property>
        <property name="text">
-        <string>00:00:00.000</string>
+        <string>2015-01-01  00:00:00.000</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="addressLayout">
+     <item>
+      <widget class="QLabel" name="addressLabel">
+       <property name="text">
+        <string>Addr:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="address">
+       <property name="minimumSize">
+        <size>
+         <width>120</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Remote data connection IP address</string>
+       </property>
+       <property name="text">
+        <string>000.000.000.000</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="dataPortLabel">
+       <property name="text">
+        <string>D:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="dataPort">
+       <property name="toolTip">
+        <string>Remote data connection port</string>
+       </property>
+       <property name="text">
+        <string>0000</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -347,9 +400,62 @@
       </widget>
      </item>
      <item>
-      <widget class="Line" name="linePlay2">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
+      <widget class="QLabel" name="controlPortLabel">
+       <property name="text">
+        <string>C:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="controlPort">
+       <property name="toolTip">
+        <string>Remote control port</string>
+       </property>
+       <property name="text">
+        <string>00000</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="applyButton">
+       <property name="maximumSize">
+        <size>
+         <width>30</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Set</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="controlLayout">
+     <item>
+      <widget class="QLabel" name="specificParmsLAbel">
+       <property name="text">
+        <string>Sp:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="specificParms"/>
+     </item>
+     <item>
+      <widget class="QPushButton" name="sendButton">
+       <property name="maximumSize">
+        <size>
+         <width>50</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Send</string>
        </property>
       </widget>
      </item>