diff --git a/.travis.yml b/.travis.yml
index a155b05e658..bb1b86b8371 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,6 +44,7 @@ addons:
       - protobuf-compiler
       - scons
       - vamp-plugin-sdk
+      - qtkeychain-dev
 before_install:
   # Virtual X, needed for analyzer waveform tests
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0         ; fi
diff --git a/SConstruct b/SConstruct
index d2e7ae81fd7..c2680fb3646 100644
--- a/SConstruct
+++ b/SConstruct
@@ -63,8 +63,9 @@ available_features = [features.Mad,
                       features.IPod,
                       features.FFMPEG,
 
-		     # Experimental features
-		     features.OpenGLES
+                      # Experimental features
+                      features.OpenGLES,
+                      features.QtKeychain
                       ]
 
 build = mixxx.MixxxBuild(target, machine, build_type,
diff --git a/build/depends.py b/build/depends.py
index ec434a6eba1..2d6e331ca75 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -632,6 +632,12 @@ def configure(self, build, conf):
     def sources(self, build):
         return ['#lib/reverb/Reverb.cc']
 
+class QtKeychain(Dependence):
+    def configure(self, build, conf):
+        libs = ['qtkeychain']
+        if not conf.CheckLib(libs):
+            raise Exception(
+                "Could not find qtkeychain.")
 
 class MixxxCore(Feature):
 
@@ -680,10 +686,12 @@ def sources(self, build):
                    "preferences/settingsmanager.cpp",
                    "preferences/replaygainsettings.cpp",
                    "preferences/broadcastsettings.cpp",
+                   "preferences/broadcastsettings_legacy.cpp",
+                   "preferences/broadcastsettingsmodel.cpp",
+                   "preferences/broadcastprofile.cpp",
                    "preferences/upgrade.cpp",
                    "preferences/dlgpreferencepage.cpp",
 
-
                    "effects/effectmanifest.cpp",
                    "effects/effectmanifestparameter.cpp",
 
@@ -755,7 +763,8 @@ def sources(self, build):
                    "engine/enginevumeter.cpp",
                    "engine/enginesidechaincompressor.cpp",
                    "engine/sidechain/enginesidechain.cpp",
-                   "engine/sidechain/networkstreamworker.cpp",
+                   "engine/sidechain/networkoutputstreamworker.cpp",
+                   "engine/sidechain/networkinputstreamworker.cpp",
                    "engine/enginexfader.cpp",
                    "engine/enginemicrophone.cpp",
                    "engine/enginedeck.cpp",
diff --git a/build/features.py b/build/features.py
index 729887075ef..ba0dc678a32 100644
--- a/build/features.py
+++ b/build/features.py
@@ -853,7 +853,7 @@ def sources(self, build):
         depends.Qt.uic(build)('preferences/dialog/dlgprefbroadcastdlg.ui')
         return ['preferences/dialog/dlgprefbroadcast.cpp',
                 'broadcast/broadcastmanager.cpp',
-                'engine/sidechain/enginebroadcast.cpp']
+                'engine/sidechain/shoutconnection.cpp']
 
 
 class Opus(Feature):
@@ -1300,3 +1300,27 @@ def sources(self, build):
 
     def depends(self, build):
         return [depends.IOKit, depends.UPower]
+
+class QtKeychain(Feature):
+    def description(self):
+        return "Secure credentials storage support for Live Broadcasting profiles"
+
+    def enabled(self, build):
+        build.flags['qtkeychain'] = util.get_flags(build.env, 'qtkeychain', 0)
+        if int(build.flags['qtkeychain']):
+            return True
+        return False
+
+    def add_options(self, build, vars):
+        vars.Add('qtkeychain', 'Set to 1 to enable secure credentials storage support for Live Broadcasting profiles', 0)
+
+    def configure(self, build, conf):
+        if not self.enabled(build):
+            return
+        build.env.Append(CPPDEFINES='__QTKEYCHAIN__')
+
+    def sources(self, build):
+        return []
+
+    def depends(self, build):
+        return [depends.QtKeychain]
diff --git a/res/skins/Shade/btn_broadcast_warning.png b/res/skins/Shade/btn_broadcast_warning.png
new file mode 100644
index 00000000000..8c5e3dad94e
Binary files /dev/null and b/res/skins/Shade/btn_broadcast_warning.png differ
diff --git a/res/skins/Shade/mixer_panel.xml b/res/skins/Shade/mixer_panel.xml
index e09bc41209e..b1e56bc67c8 100644
--- a/res/skins/Shade/mixer_panel.xml
+++ b/res/skins/Shade/mixer_panel.xml
@@ -603,7 +603,7 @@
 						
 					    <PushButton>
 							<Style></Style>
-							<NumberStates>4</NumberStates>
+							<NumberStates>5</NumberStates>
 							<State>
 								<Number>0</Number>
 								<Pressed>btn_broadcast_unconnected.png</Pressed>
@@ -624,6 +624,11 @@
 								<Pressed>btn_broadcast_failure.png</Pressed>
 								<Unpressed>btn_broadcast_failure.png</Unpressed>
 							</State>
+							<State>
+								<Number>4</Number>
+								<Pressed>btn_broadcast_warning.png</Pressed>
+								<Unpressed>btn_broadcast_warning.png</Unpressed>
+							</State>
 							<Pos>113,30</Pos>
 							<Connection>
 								<ConfigKey>[Shoutcast],enabled</ConfigKey>
diff --git a/res/skins/Tango/button_5state_display.xml b/res/skins/Tango/button_5state_display.xml
new file mode 100644
index 00000000000..ccf8f258d98
--- /dev/null
+++ b/res/skins/Tango/button_5state_display.xml
@@ -0,0 +1,66 @@
+<!--
+Description:
+  A button that has click or display controls.
+Variables:
+  ObjectName        : object name
+  TooolTipID        : standard Tooltip from mixxx db
+    see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
+  Size              : button size
+  state_X_text      : label text for state X
+  state_X_pressed   : background graphic for pressed state X
+  state_X_unpressed : background graphic for unpressed state X
+  Align             : alignment of text
+  ConfigKey         : left-click control
+  ConfigKeyDisp     : display control
+-->
+<Template>
+  <PushButton>
+    <TooltipId><Variable name="TooltipId"/></TooltipId>
+    <ObjectName><Variable name="ObjectName"/></ObjectName>
+    <Size><Variable name="Size"/></Size>
+    <NumberStates>5</NumberStates>
+    <State>
+      <Number>0</Number>
+      <Text><Variable name="state_0_text"/></Text>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Alignment><Variable name="Align"/></Alignment>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="state_1_text"/></Text>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+      <Alignment><Variable name="Align"/></Alignment>
+    </State>
+    <State>
+      <Number>2</Number>
+      <Text><Variable name="state_2_text"/></Text>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_unpressed"/></Unpressed>
+      <Alignment><Variable name="Align"/></Alignment>
+    </State>
+    <State>
+      <Number>3</Number>
+      <Text><Variable name="state_3_text"/></Text>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_3_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_3_unpressed"/></Unpressed>
+      <Alignment><Variable name="Align"/></Alignment>
+    </State>
+	<State>
+      <Number>4</Number>
+      <Text><Variable name="state_4_text"/></Text>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_4_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_4_unpressed"/></Unpressed>
+      <Alignment><Variable name="Align"/></Alignment>
+    </State>
+    <Connection>
+      <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+    <Connection>
+      <ConfigKey><Variable name="ConfigKeyDisp"/></ConfigKey>
+      <ConnectValueFromWidget>false</ConnectValueFromWidget>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/Tango/buttons/btn_broadcast_warning.svg b/res/skins/Tango/buttons/btn_broadcast_warning.svg
new file mode 100644
index 00000000000..d7a3eabf42b
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_broadcast_warning.svg
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20"
+   height="30"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="btn_broadcast_warning.svg"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4183">
+      <stop
+         style="stop-color:#00c800;stop-opacity:1;"
+         offset="0"
+         id="stop4185" />
+      <stop
+         style="stop-color:#fa00c0;stop-opacity:1"
+         offset="1"
+         id="stop4187" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4183"
+       id="linearGradient4189"
+       x1="-7.6250005"
+       y1="12.856137"
+       x2="-7.6250005"
+       y2="5.9374409"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.999999"
+     inkscape:cx="-4.5479251"
+     inkscape:cy="14.717749"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-page="true"
+     inkscape:bbox-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:window-width="1855"
+     inkscape:window-height="951"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox-edge-midpoints="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1022.3622)">
+    <path
+       sodipodi:type="arc"
+       style="fill:#00c800;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="path2990"
+       sodipodi:cx="9.7333946"
+       sodipodi:cy="7.3453302"
+       sodipodi:rx="1.314405"
+       sodipodi:ry="1.2975045"
+       d="M 11.0478,7.3453302 A 1.314405,1.2975045 0 0 1 9.7333946,8.6428348 1.314405,1.2975045 0 0 1 8.4189897,7.3453302 1.314405,1.2975045 0 0 1 9.7333946,6.0478257 1.314405,1.2975045 0 0 1 11.0478,7.3453302 Z"
+       transform="matrix(1.5216011,0,0,1.5414204,-4.810344,1019.04)" />
+    <path
+       style="fill:#ff8605;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 3.782847,1025.3276 c -2.7805093,3.4338 -2.2510804,8.4713 1.182598,11.2519 l 0.7745451,-0.9565 c -2.905412,-2.3528 -3.3534014,-6.6154 -1.0006588,-9.5207 l -0.9564843,-0.7747 z m 10.477163,-0.2261 c 2.905412,2.3528 3.353401,6.6154 1.000659,9.5207 l 0.956485,0.7747 c 2.780508,-3.4338 2.25108,-8.4713 -1.182599,-11.2519 l -0.774545,0.9565 z"
+       id="path3809-3-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#e0c100;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 6.1740553,1027.2641 c -1.7110755,2.113 -1.3852107,5.2131 0.7277604,6.9241 l 0.774545,-0.9565 c -1.5848029,-1.2834 -1.8291194,-3.6083 -0.5458143,-5.1931 l -0.9564911,-0.7745 z m 6.1495847,0.2287 c 1.584708,1.2833 1.82912,3.6083 0.545815,5.1931 l 0.95649,0.7745 c 1.711075,-2.113 1.38521,-5.2131 -0.727761,-6.9241 l -0.774544,0.9565 z"
+       id="path3809-3-6-5"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="star"
+       style="fill:url(#linearGradient4189);fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="path3039"
+       sodipodi:sides="3"
+       sodipodi:cx="-7.6250005"
+       sodipodi:cy="5.937499"
+       sodipodi:r1="9.5131493"
+       sodipodi:r2="4.7565746"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.6179939"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M -7.6250002,15.450648 -15.86363,1.1809246 l 16.47725833,-4e-7 z"
+       transform="matrix(-0.21846204,0,0,-1.5417196,8.3342268,1052.1828)"
+       inkscape:transform-center-y="-3.666742" />
+    <path
+       style="fill:#ff8605;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 16.217154,1025.3276 c 2.780508,3.4338 2.25108,8.4713 -1.182599,11.2519 l -0.774545,-0.9565 c 2.905412,-2.3528 3.353401,-6.6154 1.000659,-9.5207 l 0.956485,-0.7747 z M 5.73999,1025.1015 c -2.9054122,2.3528 -3.3534012,6.6154 -1.0006584,9.5207 l -0.9564851,0.7747 c -2.7805084,-3.4338 -2.2510801,-8.4713 1.1825987,-11.2519 l 0.7745448,0.9565 z"
+       id="path3809-3-3-7"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#e0c100;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 13.825945,1027.2641 c 1.711075,2.113 1.38521,5.2131 -0.72776,6.9241 l -0.774545,-0.9565 c 1.584803,-1.2834 1.829119,-3.6083 0.545814,-5.1931 l 0.956491,-0.7745 z m -6.1495848,0.2287 c -1.584708,1.2833 -1.8291196,3.6083 -0.5458146,5.1931 l -0.95649,0.7745 c -1.7110757,-2.113 -1.3852108,-5.2131 0.7277607,-6.9241 l 0.7745439,0.9565 z"
+       id="path3809-3-6-5-5"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/res/skins/Tango/buttons/btn_broadcast_warning_netbook.svg b/res/skins/Tango/buttons/btn_broadcast_warning_netbook.svg
new file mode 100644
index 00000000000..113ffdf5de4
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_broadcast_warning_netbook.svg
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20"
+   height="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="btn_broadcast_mini_warning.svg"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4139">
+      <stop
+         style="stop-color:#00c800;stop-opacity:1;"
+         offset="0"
+         id="stop4141" />
+      <stop
+         style="stop-color:#c8009f;stop-opacity:1"
+         offset="1"
+         id="stop4143" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4139"
+       id="linearGradient4145"
+       x1="-7.6250005"
+       y1="8.9643784"
+       x2="-7.9110913"
+       y2="4.6401877"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.999999"
+     inkscape:cx="3.2020754"
+     inkscape:cy="14.717749"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-page="true"
+     inkscape:bbox-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:window-width="1855"
+     inkscape:window-height="951"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox-edge-midpoints="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <path
+       sodipodi:type="arc"
+       style="fill:#00c800;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="path2990"
+       sodipodi:cx="9.7333946"
+       sodipodi:cy="7.3453302"
+       sodipodi:rx="1.314405"
+       sodipodi:ry="1.2975045"
+       d="M 11.0478,7.3453302 A 1.314405,1.2975045 0 0 1 9.7333946,8.6428348 1.314405,1.2975045 0 0 1 8.4189897,7.3453302 1.314405,1.2975045 0 0 1 9.7333946,6.0478257 1.314405,1.2975045 0 0 1 11.0478,7.3453302 Z"
+       transform="matrix(1.5216011,0,0,1.5414204,-4.810344,1025.04)" />
+    <path
+       style="fill:#ff8605;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 3.782847,1031.3276 c -2.7805093,3.4338 -2.2510804,8.4713 1.182598,11.2519 l 0.7745451,-0.9565 c -2.905412,-2.3528 -3.3534014,-6.6154 -1.0006588,-9.5207 l -0.9564843,-0.7747 z m 10.477163,-0.2261 c 2.905412,2.3528 3.353401,6.6154 1.000659,9.5207 l 0.956485,0.7747 c 2.780508,-3.4338 2.25108,-8.4713 -1.182599,-11.2519 l -0.774545,0.9565 z"
+       id="path3809-3-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#e0c100;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 6.1740553,1033.2641 c -1.7110755,2.113 -1.3852107,5.2131 0.7277604,6.9241 l 0.774545,-0.9565 c -1.5848029,-1.2834 -1.8291194,-3.6083 -0.5458143,-5.1931 l -0.9564911,-0.7745 z m 6.1495847,0.2287 c 1.584708,1.2833 1.82912,3.6083 0.545815,5.1931 l 0.95649,0.7745 c 1.711075,-2.113 1.38521,-5.2131 -0.727761,-6.9241 l -0.774544,0.9565 z"
+       id="path3809-3-6-5"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="star"
+       style="fill:url(#linearGradient4145);fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="path3039"
+       sodipodi:sides="3"
+       sodipodi:cx="-7.6250005"
+       sodipodi:cy="5.937499"
+       sodipodi:r1="9.5131493"
+       sodipodi:r2="4.7565746"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.6179939"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M -7.6250002,15.450648 -15.86363,1.1809246 l 16.47725833,-4e-7 z"
+       transform="matrix(-0.21846204,0,0,-1.5417196,8.3342268,1052.1828)"
+       inkscape:transform-center-y="-3.666742" />
+    <path
+       style="fill:#ff8605;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 16.217154,1031.3276 c 2.780508,3.4338 2.25108,8.4713 -1.182599,11.2519 l -0.774545,-0.9565 c 2.905412,-2.3528 3.353401,-6.6154 1.000659,-9.5207 l 0.956485,-0.7747 z M 5.73999,1031.1015 c -2.9054122,2.3528 -3.3534012,6.6154 -1.0006584,9.5207 l -0.9564851,0.7747 c -2.7805084,-3.4338 -2.2510801,-8.4713 1.1825987,-11.2519 l 0.7745448,0.9565 z"
+       id="path3809-3-3-7"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#e0c100;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 13.825945,1033.2641 c 1.711075,2.113 1.38521,5.2131 -0.72776,6.9241 l -0.774545,-0.9565 c 1.584803,-1.2834 1.829119,-3.6083 0.545814,-5.1931 l 0.956491,-0.7745 z m -6.1495848,0.2287 c -1.584708,1.2833 -1.8291196,3.6083 -0.5458146,5.1931 l -0.95649,0.7745 c -1.7110757,-2.113 -1.3852108,-5.2131 0.7277607,-6.9241 l 0.7745439,0.9565 z"
+       id="path3809-3-6-5-5"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/res/skins/Tango/centerbox_deck12.xml b/res/skins/Tango/centerbox_deck12.xml
index 75f426f81b2..b333567bd41 100644
--- a/res/skins/Tango/centerbox_deck12.xml
+++ b/res/skins/Tango/centerbox_deck12.xml
@@ -166,7 +166,7 @@ Description:
         <Layout>horizontal</Layout>
         <Size>104f,30me</Size>
         <Children>
-          <Template src="skin:button_4state_display.xml"><!-- Broadcast -->
+          <Template src="skin:button_5state_display.xml"><!-- Broadcast -->
             <SetVariable name="TooltipId">broadcast_enabled</SetVariable>
             <SetVariable name="ObjectName">BroadcastButton</SetVariable>
             <SetVariable name="Size">24f,34f</SetVariable>
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index d4585c5ad9c..a8cde8614ec 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -1052,8 +1052,12 @@ WBeatSpinBox {
   #BroadcastButton[displayValue="3"] {
     background: transparent url(skin:/buttons/btn_broadcast_failure.svg) no-repeat center center;
     }
+  #BroadcastButton[displayValue="4"] {
+    background: transparent url(skin:/buttons/btn_broadcast_warning.svg) no-repeat center center;
+    }
     #BroadcastButton[displayValue="2"]:hover,
-    #BroadcastButton[displayValue="3"]:hover {
+    #BroadcastButton[displayValue="3"]:hover,
+    #BroadcastButton[displayValue="4"]:hover {
       background: #0f0f0f url(skin:/buttons/btn_broadcast_off.svg) no-repeat center center;
     }
 
@@ -1075,8 +1079,12 @@ WBeatSpinBox {
   #BroadcastButtonNetbook[displayValue="3"] {
     background: transparent url(skin:/buttons/btn_broadcast_failure_netbook.svg) no-repeat center center;
     }
+  #BroadcastButtonNetbook[displayValue="4"] {
+    background: transparent url(skin:/buttons/btn_broadcast_warning_netbook.svg) no-repeat center center;
+    }
     #BroadcastButtonNetbook[displayValue="2"]:hover,
-    #BroadcastButtonNetbook[displayValue="3"]:hover {
+    #BroadcastButtonNetbook[displayValue="3"]:hover,
+    #BroadcastButtonNetbook[displayValue="4"]:hover {
       background: #0f0f0f url(skin:/buttons/btn_broadcast_off_netbook.svg) no-repeat center center;
     }
 
diff --git a/res/skins/Tango/topbar_netbook.xml b/res/skins/Tango/topbar_netbook.xml
deleted file mode 100644
index d2f42643162..00000000000
--- a/res/skins/Tango/topbar_netbook.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<!--
-Description:
-  Top bar only displayed in netbook mode (auto or enforced) with
-  * GUI toggle buttons (FX, Sampler, Lib, Wave ...)
-  * Crossfader (if enabled)
-  * Logo
-  * recording button with duration display
-  * broadcast button
-  * clock
-  * skin settings toggler
--->
-<Template>
-  <WidgetGroup><!-- Skin Controls -->
-    <ObjectName>AlignCenter</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>me,min</SizePolicy>
-    <Children>
-
-      <WidgetGroup><!-- Skin Controls -->
-        <Layout>horizontal</Layout>
-        <ObjectName>SkinControlsBarLeft</ObjectName>
-        <SizePolicy>me,min</SizePolicy>
-        <Children>
-
-          <Template src="skin:button_2state_persist.xml"><!-- FX -->
-            <SetVariable name="TooltipId">show_effects</SetVariable>
-            <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
-            <SetVariable name="Size">34f,20f</SetVariable>
-            <SetVariable name="state_0_text">FX</SetVariable>
-            <SetVariable name="state_1_text">FX</SetVariable>
-            <SetVariable name="ConfigKey">[EffectRack1],show</SetVariable>
-          </Template>
-
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_2state_persist.xml"><!-- Samplers -->
-            <SetVariable name="TooltipId">show_samplers</SetVariable>
-            <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
-            <SetVariable name="Size">34f,20f</SetVariable>
-            <SetVariable name="state_0_text">SAM</SetVariable>
-            <SetVariable name="state_1_text">SAM</SetVariable>
-            <SetVariable name="ConfigKey">[Samplers],show_samplers</SetVariable>
-          </Template>
-
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_2state_persist.xml"><!-- Library -->
-            <SetVariable name="TooltipId">show_library</SetVariable>
-            <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
-            <SetVariable name="Size">34f,20f</SetVariable>
-            <SetVariable name="state_0_text">LIB</SetVariable>
-            <SetVariable name="state_1_text">LIB</SetVariable>
-            <SetVariable name="ConfigKey">[Library],show_library</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>10f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_2state_persist.xml"><!-- 4 Decks -->
-            <SetVariable name="ObjectName">GuiToggleButton2</SetVariable>
-            <SetVariable name="Size">20f,20f</SetVariable>
-            <SetVariable name="TooltipId">toggle_4decks</SetVariable>
-            <SetVariable name="state_0_pressed">2decks.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">2decks.svg</SetVariable>
-            <SetVariable name="state_1_pressed">4decks.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">4decks.svg</SetVariable>
-            <SetVariable name="ConfigKey">[Master],show_4decks</SetVariable>
-          </Template>
-
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_2state_persist.xml"><!-- Waveforms -->
-            <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
-            <SetVariable name="Size">20f,20f</SetVariable>
-            <SetVariable name="state_0_pressed">wave_off.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">wave_off.svg</SetVariable>
-            <SetVariable name="state_1_pressed">wave_on.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">wave_on.svg</SetVariable>
-            <SetVariable name="ConfigKey">[Tango],stacked_waveforms</SetVariable>
-          </Template>
-
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_2state_persist.xml"><!-- Spinny -->
-            <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
-            <SetVariable name="Size">20f,20f</SetVariable>
-            <SetVariable name="state_0_pressed">mixerbar_off.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">mixerbar_off.svg</SetVariable>
-            <SetVariable name="state_1_pressed">mixerbar_on.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">mixerbar_on.svg</SetVariable>
-            <SetVariable name="ConfigKey">[Tango],mixerbar</SetVariable>
-          </Template>
-
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_2state_persist.xml">
-            <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
-            <SetVariable name="Size">20f,20f</SetVariable>
-            <SetVariable name="state_0_unpressed">hotcues_off.svg</SetVariable>
-            <SetVariable name="state_0_pressed">hotcues_off.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">hotcues_on.svg</SetVariable>
-            <SetVariable name="state_1_pressed">hotcues_on.svg</SetVariable>
-            <SetVariable name="ConfigKey">[Tango],hotcues</SetVariable>
-          </Template>
-
-          <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_2state_persist.xml"><!-- Mixer -->
-            <SetVariable name="TooltipId">show_mixer</SetVariable>
-            <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
-            <SetVariable name="Size">20f,20f</SetVariable>
-            <SetVariable name="state_0_pressed">mixer_off.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">mixer_off.svg</SetVariable>
-            <SetVariable name="state_1_pressed">mixer_on.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">mixer_on.svg</SetVariable>
-            <SetVariable name="ConfigKey">[Tango],channel_mixer</SetVariable>
-          </Template>
-
-        </Children>
-      </WidgetGroup><!-- /Skin controls -->
-
-      <!-- Vertical layout:
-          Top row (0px tall): spacers for PitchSlider, VUMeter etc.
-          Bootom row: Crossfader lies on top if enabled -->
-      <WidgetGroup>
-        <ObjectName>AlignHCenter</ObjectName>
-        <SizePolicy>min,min</SizePolicy>
-        <Layout>vertical</Layout>
-        <Children>
-
-          <WidgetGroup><!-- Crossfader -->
-            <ObjectName>CrossfaderNetbook</ObjectName>
-            <SizePolicy>min,min</SizePolicy>
-            <Layout>horizontal</Layout>
-            <Children>
-              <WidgetGroup><Size>10f,1min</Size></WidgetGroup>
-              <SliderComposed>
-                <TooltipId>crossfader</TooltipId>
-                <Handle>skin:/knobs_sliders/slider_crossfader_handle.svg</Handle>
-                <Slider>skin:/knobs_sliders/slider_crossfader_scale.svg</Slider>
-                <Horizontal>true</Horizontal>
-                <Connection>
-                  <ConfigKey>[Master],crossfader</ConfigKey>
-                </Connection>
-              </SliderComposed>
-              <WidgetGroup><Size>10f,1min</Size></WidgetGroup>
-            </Children>
-            <Connection>
-              <ConfigKey persist="true">[Tango],crossfader</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup><!-- /Crossfader -->
-
-          <!-- zero-height spacers below Crossfader -->
-          <Template src="skin:spacer_topbar_netbook.xml"/>
-
-        </Children>
-      </WidgetGroup><!-- Stack of spacers for PitchSlider, VUMeter etc.
-                      Crossfader lies on top if enabled -->
-
-      <WidgetGroup><!-- Logo, Rec, Broadcast, Clock, Skinsettings -->
-        <Layout>horizontal</Layout>
-        <ObjectName>SkinControlsBarRight</ObjectName>
-        <SizePolicy>me,min</SizePolicy>
-        <Children>
-          <Template src="skin:button_2state_persist.xml">
-            <SetVariable name="ObjectName">LogoMaxi</SetVariable>
-            <SetVariable name="Size">81f,20f</SetVariable>
-            <SetVariable name="state_0_pressed">logo_104x26_grey.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">logo_104x26_grey.svg</SetVariable>
-            <SetVariable name="state_1_pressed">logo_104x26.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">logo_104x26.svg</SetVariable>
-            <SetVariable name="ConfigKey">[Tango],colorLogo</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-
-          <WidgetGroup><!-- Recording button & recording duration label -->
-            <Layout>stacked</Layout>
-            <Size>60f,20f</Size>
-            <Children>
-              <Template src="skin:button_3state_display.xml">
-                <SetVariable name="ObjectName">RecordingButton</SetVariable>
-                <SetVariable name="TooltipId">toggle_recording</SetVariable>
-                <SetVariable name="Size">60f,20f</SetVariable>
-                <SetVariable name="state_0_text">REC</SetVariable>
-                <SetVariable name="state_1_text">. . .</SetVariable>
-                <!-- Empty to show the RecordingDuration underneath -->
-                <SetVariable name="state_2_text"></SetVariable>
-                <SetVariable name="ConfigKey">[Recording],toggle_recording</SetVariable>
-                <SetVariable name="ConfigKeyDisp">[Recording],status</SetVariable>
-              </Template>
-
-              <WidgetGroup><!-- Rec dot + RecDuration -->
-                <Layout>horizontal</Layout>
-                <Size>60f,20f</Size>
-                <Children>
-                  <WidgetGroup>
-                    <ObjectName>RecDot</ObjectName>
-                    <Size>15f,20f</Size>
-                  </WidgetGroup>
-
-                  <RecordingDuration>
-                    <ObjectName>RecDurationLabel</ObjectName>
-                    <Size>45f,20f</Size>
-                    <Alignment>center</Alignment>
-                  </RecordingDuration>
-                </Children>
-              </WidgetGroup><!-- /Rec dot + RecDuration -->
-            </Children>
-          </WidgetGroup><!-- /Recording button & recording duration label -->
-
-          <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_4state_display.xml">
-            <SetVariable name="TooltipId">broadcast_enabled</SetVariable>
-            <SetVariable name="ObjectName">BroadcastButtonNetbook</SetVariable>
-            <SetVariable name="Size">24f,24f</SetVariable>
-            <SetVariable name="ConfigKey">[Shoutcast],enabled</SetVariable>
-            <SetVariable name="ConfigKeyDisp">[Shoutcast],status</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
-
-          <WidgetGroup><!-- Clock + latency display -->
-            <Size>32f,24min</Size>
-            <Layout>vertical</Layout>
-            <Children>
-              <Time>
-                <TooltipId>time</TooltipId>
-                <ObjectName>Clock</ObjectName>
-                <Size>32f,16f</Size>
-                <ShowSeconds>false</ShowSeconds>
-                <!-- This has no effect, neither has 'text-align' in qss.
-                <Align>center</Align>   -->
-              </Time>
-              <VuMeter><!-- latency usage -->
-                <Size>31f,3f</Size>
-                <TooltipId>audio_latency_usage</TooltipId>
-                <PathVu>skin:/graphics/latency_usage_over.png</PathVu>
-                <PathBack>skin:/graphics/latency_usage.png</PathBack>
-                <Horizontal>true</Horizontal>
-                <PeakHoldSize>5</PeakHoldSize>
-                <PeakHoldTime>1000</PeakHoldTime>
-                <PeakFallTime>100</PeakFallTime>
-                <PeakFallStep>1</PeakFallStep>
-                <Connection>
-                  <ConfigKey>[Master],audio_latency_usage</ConfigKey>
-                </Connection>
-              </VuMeter><!-- /latency usage -->
-            </Children>
-          </WidgetGroup><!-- Clock + latency display -->
-
-          <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
-
-          <Template src="skin:button_2state.xml">
-            <SetVariable name="ObjectName">SkinSettingsToggler</SetVariable>
-            <SetVariable name="Size">24f,24f</SetVariable>
-            <SetVariable name="ConfigKey">[Tango],skin_settings</SetVariable>
-          </Template>
-
-        </Children>
-      </WidgetGroup><!-- /Logo, Rec, Broadcast, Clock, Skinsettings -->
-
-    </Children>
-    <Connection>
-      <ConfigKey>[Tango],netbook_mode</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/src/broadcast/broadcastmanager.cpp b/src/broadcast/broadcastmanager.cpp
index 0e328e2eeb0..2a377538a06 100644
--- a/src/broadcast/broadcastmanager.cpp
+++ b/src/broadcast/broadcastmanager.cpp
@@ -1,33 +1,78 @@
-#include "broadcast/broadcastmanager.h"
+// shout.h checks for WIN32 to see if we are on Windows.
+#ifdef WIN64
+#define WIN32
+#endif
+#include <shout/shout.h>
+#ifdef WIN64
+#undef WIN32
+#endif
 
 #include "broadcast/defs_broadcast.h"
 #include "engine/enginemaster.h"
 #include "engine/sidechain/enginenetworkstream.h"
 #include "engine/sidechain/enginesidechain.h"
 #include "soundio/soundmanager.h"
+#include "util/logger.h"
+
+#include "broadcast/broadcastmanager.h"
 
-BroadcastManager::BroadcastManager(UserSettingsPointer pConfig,
+namespace {
+const mixxx::Logger kLogger("BroadcastManager");
+}
+
+BroadcastManager::BroadcastManager(SettingsManager* pSettingsManager,
                                    SoundManager* pSoundManager)
-        : m_pConfig(pConfig) {
-    QSharedPointer<EngineNetworkStream> pNetworkStream =
-            pSoundManager->getNetworkStream();
-    if (!pNetworkStream.isNull()) {
-        m_pBroadcast = QSharedPointer<EngineBroadcast>(
-                new EngineBroadcast(pConfig));
-        pNetworkStream->addWorker(m_pBroadcast);
+        : m_pConfig(pSettingsManager->settings()),
+          m_pBroadcastSettings(pSettingsManager->broadcastSettings()),
+          m_pNetworkStream(pSoundManager->getNetworkStream()) {
+    const bool persist = true;
+    m_pBroadcastEnabled = new ControlPushButton(
+            ConfigKey(BROADCAST_PREF_KEY,"enabled"), persist);
+    m_pBroadcastEnabled->setButtonMode(ControlPushButton::TOGGLE);
+    connect(m_pBroadcastEnabled, SIGNAL(valueChanged(double)),
+            this, SLOT(slotControlEnabled(double)));
+
+    m_pStatusCO = new ControlObject(ConfigKey(BROADCAST_PREF_KEY, "status"));
+    m_pStatusCO->setReadOnly();
+    m_pStatusCO->forceSet(STATUSCO_UNCONNECTED);
+
+    // Initialize libshout
+    shout_init();
+
+    // Initialize connections list from the current state of BroadcastSettings
+    QList<BroadcastProfilePtr> profiles = m_pBroadcastSettings->profiles();
+    for(BroadcastProfilePtr profile : profiles) {
+        addConnection(profile);
     }
-    m_pBroadcastEnabled = new ControlProxy(
-            BROADCAST_PREF_KEY, "enabled", this);
-    m_pBroadcastEnabled->connectValueChanged(SLOT(slotControlEnabled(double)));
+
+    // Connect add/remove profiles signals.
+    // Passing the raw pointer from QSharedPointer to connect() is fine, since
+    // connect is trusted that it won't delete the pointer
+    connect(m_pBroadcastSettings.data(), SIGNAL(profileAdded(BroadcastProfilePtr)),
+            this, SLOT(slotProfileAdded(BroadcastProfilePtr)));
+    connect(m_pBroadcastSettings.data(), SIGNAL(profileRemoved(BroadcastProfilePtr)),
+            this, SLOT(slotProfileRemoved(BroadcastProfilePtr)));
+    connect(m_pBroadcastSettings.data(), SIGNAL(profilesChanged()),
+            this, SLOT(slotProfilesChanged()));
 }
 
 BroadcastManager::~BroadcastManager() {
     // Disable broadcast so when Mixxx starts again it will not connect.
     m_pBroadcastEnabled->set(0);
+
+    delete m_pStatusCO;
+    delete m_pBroadcastEnabled;
+
+    shout_shutdown();
 }
 
 void BroadcastManager::setEnabled(bool value) {
     m_pBroadcastEnabled->set(value);
+    // TODO(Palakis): apparently, calling set on a ControlObject and not through
+    // a ControlProxy doesn't trigger the valueChanged signal here.
+    // This is a quick fix, but there has to be a better way to do this, rather
+    // than calling the associated slot directly.
+    slotControlEnabled(value);
 }
 
 bool BroadcastManager::isEnabled() {
@@ -35,5 +80,169 @@ bool BroadcastManager::isEnabled() {
 }
 
 void BroadcastManager::slotControlEnabled(double v) {
+    if (v > 1.0) {
+        // Wrap around manually .
+        // Wrapping around in WPushbutton does not work
+        // since the status button has 4 states, but this CO is bool
+        v = 0.0;
+        m_pBroadcastEnabled->set(v);
+        emit(broadcastEnabled(v));
+    }
+
+    if (v > 0.0) {
+        bool atLeastOneEnabled = false;
+        QList<BroadcastProfilePtr> profiles = m_pBroadcastSettings->profiles();
+        for(BroadcastProfilePtr profile : profiles) {
+            if(profile->getEnabled()) {
+                atLeastOneEnabled = true;
+                break;
+            }
+        }
+
+        if(!atLeastOneEnabled) {
+            m_pBroadcastEnabled->set(false);
+            emit(broadcastEnabled(0.0));
+            QMessageBox::warning(nullptr, tr("Action failed"),
+                                tr("Please enable at least one connection to use Live Broadcasting."));
+            return;
+        }
+
+        slotProfilesChanged();
+    } else {
+        m_pStatusCO->forceSet(STATUSCO_UNCONNECTED);
+        QList<BroadcastProfilePtr> profiles = m_pBroadcastSettings->profiles();
+        for(BroadcastProfilePtr profile : profiles) {
+           if(profile->connectionStatus() == BroadcastProfile::STATUS_FAILURE) {
+               profile->setConnectionStatus(BroadcastProfile::STATUS_UNCONNECTED);
+           }
+        }
+    }
+
     emit(broadcastEnabled(v > 0.0));
 }
+
+void BroadcastManager::slotProfileAdded(BroadcastProfilePtr profile) {
+    addConnection(profile);
+}
+
+void BroadcastManager::slotProfileRemoved(BroadcastProfilePtr profile) {
+    removeConnection(profile);
+}
+
+void BroadcastManager::slotProfilesChanged() {
+    QVector<NetworkOutputStreamWorkerPtr> workers = m_pNetworkStream->outputWorkers();
+    for(NetworkOutputStreamWorkerPtr pWorker : workers) {
+        ShoutConnectionPtr connection = qSharedPointerCast<ShoutConnection>(pWorker);
+        if(connection) {
+            BroadcastProfilePtr profile = connection->profile();
+            if(profile->connectionStatus() == BroadcastProfile::STATUS_FAILURE
+                    && !profile->getEnabled()) {
+                profile->setConnectionStatus(BroadcastProfile::STATUS_UNCONNECTED);
+            }
+            connection->applySettings();
+        }
+    }
+}
+
+bool BroadcastManager::addConnection(BroadcastProfilePtr profile) {
+    if(!profile)
+        return false;
+
+    if(findConnectionForProfile(profile).isNull() == false) {
+        return false;
+    }
+
+    ShoutConnectionPtr connection(new ShoutConnection(profile, m_pConfig));
+    m_pNetworkStream->addOutputWorker(connection);
+
+    connect(profile.data(), SIGNAL(connectionStatusChanged(int)),
+            this, SLOT(slotConnectionStatusChanged(int)));
+
+    kLogger.debug() << "addConnection: created connection for profile"
+                    << profile->getProfileName();
+    return true;
+}
+
+bool BroadcastManager::removeConnection(BroadcastProfilePtr profile) {
+    if(!profile)
+        return false;
+
+    ShoutConnectionPtr connection = findConnectionForProfile(profile);
+    if(connection) {
+        disconnect(profile.data(), SIGNAL(connectionStatusChanged(int)),
+                   this, SLOT(slotConnectionStatusChanged(int)));
+
+        // Disabling the profile tells ShoutOutput's thread to disconnect
+        connection->profile()->setEnabled(false);
+        m_pNetworkStream->removeOutputWorker(connection);
+
+        kLogger.debug() << "removeConnection: removed connection for profile"
+                        << profile->getProfileName();
+        return true;
+    }
+
+    return false;
+}
+
+ShoutConnectionPtr BroadcastManager::findConnectionForProfile(BroadcastProfilePtr profile) {
+    QVector<NetworkOutputStreamWorkerPtr> workers = m_pNetworkStream->outputWorkers();
+    for(NetworkOutputStreamWorkerPtr pWorker : workers) {
+        ShoutConnectionPtr connection = qSharedPointerCast<ShoutConnection>(pWorker);
+        if(connection.isNull())
+            continue;
+
+        if(connection->profile() == profile) {
+            return connection;
+        }
+    }
+
+    return ShoutConnectionPtr();
+}
+
+void BroadcastManager::slotConnectionStatusChanged(int newState) {
+    Q_UNUSED(newState);
+    int enabledCount = 0, connectingCount = 0,
+        connectedCount = 0, failedCount = 0;
+
+    // Collect status info
+    QList<BroadcastProfilePtr> profiles = m_pBroadcastSettings->profiles();
+    for (BroadcastProfilePtr profile : profiles) {
+        if(!profile->getEnabled()) {
+            continue;
+        }
+        enabledCount++;
+
+        int status = profile->connectionStatus();
+        if (status == BroadcastProfile::STATUS_FAILURE) {
+            failedCount++;
+        }
+        else if (status == BroadcastProfile::STATUS_CONNECTING) {
+            connectingCount++;
+        }
+        else if (status == BroadcastProfile::STATUS_CONNECTED) {
+            connectedCount++;
+        }
+    }
+
+    // Changed global status indicator depending on global connections status
+    if (enabledCount < 1) {
+        // Disable Live Broadcasting if all connections are disabled manually.
+        // Calling setEnabled will also update the status CO to UNCONNECTED
+        setEnabled(false);
+    }
+    else if (failedCount >= enabledCount) {
+        m_pStatusCO->forceSet(STATUSCO_FAILURE);
+    }
+    else if (failedCount > 0 && failedCount < enabledCount) {
+        m_pStatusCO->forceSet(STATUSCO_WARNING);
+    }
+    else if (connectingCount > 0) {
+        m_pStatusCO->forceSet(STATUSCO_CONNECTING);
+    }
+    else if (connectedCount > 0) {
+        m_pStatusCO->forceSet(STATUSCO_CONNECTED);
+    }
+    else {
+        m_pStatusCO->forceSet(STATUSCO_UNCONNECTED);
+    }
+}
diff --git a/src/broadcast/broadcastmanager.h b/src/broadcast/broadcastmanager.h
index 092e11f03fe..87af436771c 100644
--- a/src/broadcast/broadcastmanager.h
+++ b/src/broadcast/broadcastmanager.h
@@ -3,15 +3,26 @@
 
 #include <QObject>
 
-#include "engine/sidechain/enginebroadcast.h"
+#include "preferences/settingsmanager.h"
 #include "preferences/usersettings.h"
+#include "engine/sidechain/enginenetworkstream.h"
+#include "engine/sidechain/shoutconnection.h"
 
 class SoundManager;
+class ControlPushButton;
 
 class BroadcastManager : public QObject {
     Q_OBJECT
   public:
-    BroadcastManager(UserSettingsPointer pConfig,
+    enum StatusCOStates {
+        STATUSCO_UNCONNECTED = 0, // IDLE state, no error
+        STATUSCO_CONNECTING = 1, // 30 s max
+        STATUSCO_CONNECTED = 2, // On Air
+        STATUSCO_FAILURE = 3, // Happens when all connection fails
+        STATUSCO_WARNING = 4
+    };
+
+    BroadcastManager(SettingsManager* pSettingsManager,
                      SoundManager* pSoundManager);
     virtual ~BroadcastManager();
 
@@ -28,11 +39,22 @@ class BroadcastManager : public QObject {
 
   private slots:
     void slotControlEnabled(double v);
+    void slotProfileAdded(BroadcastProfilePtr profile);
+    void slotProfileRemoved(BroadcastProfilePtr profile);
+    void slotProfilesChanged();
+    void slotConnectionStatusChanged(int newState);
 
   private:
+    bool addConnection(BroadcastProfilePtr profile);
+    bool removeConnection(BroadcastProfilePtr profile);
+    ShoutConnectionPtr findConnectionForProfile(BroadcastProfilePtr profile);
+
     UserSettingsPointer m_pConfig;
-    QSharedPointer<EngineBroadcast> m_pBroadcast;
-    ControlProxy* m_pBroadcastEnabled;
+    BroadcastSettingsPointer m_pBroadcastSettings;
+    QSharedPointer<EngineNetworkStream> m_pNetworkStream;
+
+    ControlPushButton* m_pBroadcastEnabled;
+    ControlObject* m_pStatusCO;
 };
 
 #endif /* BROADCAST_BROADCASTMANAGER_H */
diff --git a/src/broadcast/defs_broadcast.h b/src/broadcast/defs_broadcast.h
index ce9414ba016..dad19eaea81 100644
--- a/src/broadcast/defs_broadcast.h
+++ b/src/broadcast/defs_broadcast.h
@@ -26,4 +26,13 @@
 #define BROADCAST_FORMAT_MP3 "MP3"
 #define BROADCAST_FORMAT_OV "OggVorbis"
 
+// EngineNetworkStream can't use locking mechanisms to protect its
+// internal worker list against concurrency issues, as it is used by
+// methods called from the audio engine thread.
+// Instead, the internal list has a fixed number of QSharedPointers
+// (which are thread-safe) initialized to null pointers. R/W operations to
+// the workers are then performed on thread-safe QSharedPointers and not
+// onto the thread-unsafe QVector
+#define BROADCAST_MAX_CONNECTIONS 16
+
 #endif /* DEFS_BROADCAST_H */
diff --git a/src/encoder/encoder.h b/src/encoder/encoder.h
index 352fb861f78..7ed0e431d43 100644
--- a/src/encoder/encoder.h
+++ b/src/encoder/encoder.h
@@ -34,7 +34,7 @@ class Encoder {
     // encodes the provided buffer of audio.
     virtual void encodeBuffer(const CSAMPLE *samples, const int size) = 0;
     // Adds metadata to the encoded audio, i.e., the ID3 tag. Currently only used
-    // by EngineRecord, EngineBroadcast does something different.
+    // by EngineRecord, ShoutConnection does something different.
     virtual void updateMetaData(const QString& artist, const QString& title, const QString& album) = 0;
     // called at the end when encoding is finished
     virtual void flush() = 0;
diff --git a/src/encoder/encoderbroadcastsettings.cpp b/src/encoder/encoderbroadcastsettings.cpp
index 19f861fe52d..f255eff5e03 100644
--- a/src/encoder/encoderbroadcastsettings.cpp
+++ b/src/encoder/encoderbroadcastsettings.cpp
@@ -10,9 +10,9 @@
 
 #define DEFAULT_BITRATE 128
 
-EncoderBroadcastSettings::EncoderBroadcastSettings(BroadcastSettings settings) :
-m_settings(settings)
-{
+EncoderBroadcastSettings::EncoderBroadcastSettings(
+        BroadcastProfilePtr profile)
+        : m_pProfile(profile) {
     m_qualList.append(32);
     m_qualList.append(48);
     m_qualList.append(64);
@@ -26,41 +26,34 @@ m_settings(settings)
     m_qualList.append(256);
     m_qualList.append(320);
 }
-EncoderBroadcastSettings::~EncoderBroadcastSettings()
-{
-    
+EncoderBroadcastSettings::~EncoderBroadcastSettings() {
 }
 
-
-QList<int> EncoderBroadcastSettings::getQualityValues() const
-{
+QList<int> EncoderBroadcastSettings::getQualityValues() const {
     return m_qualList;
 }
 
 // Sets the value
-void EncoderBroadcastSettings::setQualityByValue(int qualityValue) 
-{
+void EncoderBroadcastSettings::setQualityByValue(int qualityValue) {
     if (m_qualList.contains(qualityValue)) {
-        m_settings.setBitrate(qualityValue);
+        m_pProfile->setBitrate(qualityValue);
     } else {
         qWarning() << "Invalid qualityValue given to EncoderBroadcastSettings: " 
             << qualityValue << ". Ignoring it";
     }
 }
 
-void EncoderBroadcastSettings::setQualityByIndex(int qualityIndex)
-{
+void EncoderBroadcastSettings::setQualityByIndex(int qualityIndex) {
     if (qualityIndex >= 0 && qualityIndex < m_qualList.size()) {
-        m_settings.setBitrate(m_qualList.at(qualityIndex));
+        m_pProfile->setBitrate(m_qualList.at(qualityIndex));
     } else {
         qWarning() << "Invalid qualityIndex given to EncoderBroadcastSettings: " 
             << qualityIndex << ". Ignoring it";
     }
 }
 
-int EncoderBroadcastSettings::getQuality() const
-{
-    int bitrate = m_settings.getBitrate();
+int EncoderBroadcastSettings::getQuality() const {
+    int bitrate = m_pProfile->getBitrate();
     if (m_qualList.contains(bitrate)) {
         return bitrate;
     }
@@ -70,18 +63,18 @@ int EncoderBroadcastSettings::getQuality() const
     }
     return DEFAULT_BITRATE;
 }
-int EncoderBroadcastSettings::getQualityIndex() const
-{
+
+int EncoderBroadcastSettings::getQualityIndex() const {
     return m_qualList.indexOf(getQuality());
 }
 
 void EncoderBroadcastSettings::setChannelMode(EncoderSettings::ChannelMode mode)
 {
-    m_settings.setChannels(static_cast<int>(mode));
+    m_pProfile->setChannels(static_cast<int>(mode));
 }
-EncoderSettings::ChannelMode EncoderBroadcastSettings::getChannelMode() const
-{
-    switch(m_settings.getChannels()) {
+
+EncoderSettings::ChannelMode EncoderBroadcastSettings::getChannelMode() const {
+    switch(m_pProfile->getChannels()) {
         case 1: return EncoderSettings::ChannelMode::MONO;
         case 2: return EncoderSettings::ChannelMode::STEREO;
         case 0: // fallthrough
diff --git a/src/encoder/encoderbroadcastsettings.h b/src/encoder/encoderbroadcastsettings.h
index 4198f970e44..15bdb4bfd33 100644
--- a/src/encoder/encoderbroadcastsettings.h
+++ b/src/encoder/encoderbroadcastsettings.h
@@ -15,7 +15,7 @@
 
 class EncoderBroadcastSettings : public EncoderSettings {
   public:
-    EncoderBroadcastSettings(BroadcastSettings settings);
+    EncoderBroadcastSettings(BroadcastProfilePtr profile);
     virtual ~EncoderBroadcastSettings();
 
     // Indicates that it uses the quality slider section of the preferences
@@ -39,10 +39,9 @@ class EncoderBroadcastSettings : public EncoderSettings {
 
   private:
     QList<int> m_qualList;
-    BroadcastSettings m_settings;
+    BroadcastProfilePtr m_pProfile;
 };
 
-
 inline bool EncoderBroadcastSettings::usesQualitySlider() const
 {
     return true;
diff --git a/src/engine/sidechain/enginenetworkstream.cpp b/src/engine/sidechain/enginenetworkstream.cpp
index 4afc76b56c5..d23480b45d2 100644
--- a/src/engine/sidechain/enginenetworkstream.cpp
+++ b/src/engine/sidechain/enginenetworkstream.cpp
@@ -14,8 +14,11 @@ typedef VOID (WINAPI *PgGetSystemTimeFn)(LPFILETIME);
 static PgGetSystemTimeFn s_pfpgGetSystemTimeFn = NULL;
 #endif
 
+#include "broadcast/defs_broadcast.h"
+#include "util/logger.h"
 #include "util/sample.h"
 
+namespace {
 const int kNetworkLatencyFrames = 8192; // 185 ms @ 44100 Hz
 // Related chunk sizes:
 // Mp3 frames = 1152 samples
@@ -29,20 +32,20 @@ const int kBufferFrames = kNetworkLatencyFrames * 4; // 743 ms @ 44100 Hz
 // We allow to buffer two extra chunks for a CPU overload case, when
 // the broadcast thread is not scheduled in time.
 
+const mixxx::Logger kLogger("EngineNetworkStream");
+}
+
 EngineNetworkStream::EngineNetworkStream(int numOutputChannels,
                                          int numInputChannels)
-    : m_pOutputFifo(NULL),
-      m_pInputFifo(NULL),
+    : m_pInputFifo(nullptr),
       m_numOutputChannels(numOutputChannels),
       m_numInputChannels(numInputChannels),
       m_sampleRate(0),
-      m_streamStartTimeUs(-1),
-      m_streamFramesWritten(0),
-      m_streamFramesRead(0),
-      m_writeOverflowCount(0) {
-    if (numOutputChannels) {
-        m_pOutputFifo = new FIFO<CSAMPLE>(numOutputChannels * kBufferFrames);
-    }
+      m_inputStreamStartTimeUs(-1),
+      m_inputStreamFramesWritten(0),
+      m_inputStreamFramesRead(0),
+      m_outputWorkers(BROADCAST_MAX_CONNECTIONS),
+      m_pInputWorker(nullptr) {
     if (numInputChannels) {
         m_pInputFifo = new FIFO<CSAMPLE>(numInputChannels * kBufferFrames);
     }
@@ -64,133 +67,66 @@ EngineNetworkStream::EngineNetworkStream(int numOutputChannels,
 }
 
 EngineNetworkStream::~EngineNetworkStream() {
-    if (m_streamStartTimeUs >= 0) {
+    if (m_inputStreamStartTimeUs >= 0) {
         stopStream();
     }
-    delete m_pOutputFifo;
+
     delete m_pInputFifo;
 }
 
 void EngineNetworkStream::startStream(double sampleRate) {
     m_sampleRate = sampleRate;
-    m_streamStartTimeUs = getNetworkTimeUs();
-    m_streamFramesWritten = 0;
-}
-
-void EngineNetworkStream::stopStream() {
-    m_streamStartTimeUs = -1;
-}
-
-int EngineNetworkStream::getWriteExpected() {
-    return static_cast<int>(getStreamTimeFrames() - m_streamFramesWritten);
-}
-
-int EngineNetworkStream::getReadExpected() {
-    return static_cast<int>(getStreamTimeFrames() - m_streamFramesRead);
-}
+    m_inputStreamStartTimeUs = getNetworkTimeUs();
+    m_inputStreamFramesWritten = 0;
 
-void EngineNetworkStream::write(const CSAMPLE* buffer, int frames) {
-    if (m_pWorker.isNull()) {
-        return;
-    }
+    for(NetworkOutputStreamWorkerPtr worker : m_outputWorkers) {
+        if (worker.isNull()) {
+            continue;
+        }
 
-    //qDebug() << "EngineNetworkStream::write()" << frames;
-    if (!m_pWorker->threadWaiting()) {
-        // no thread waiting, so we can advance the stream without
-        // buffering
-        m_streamFramesWritten += frames;
-        return;
-    }
-    int writeAvailable = m_pOutputFifo->writeAvailable();
-    int writeRequired = frames * m_numOutputChannels;
-    if (writeAvailable < writeRequired) {
-        qDebug() << "EngineNetworkStream::write() buffer full, loosing samples";
-        NetworkStreamWorker::debugState();
-        m_writeOverflowCount++;
-    }
-    int copyCount = math_min(writeAvailable, writeRequired);
-    if (copyCount > 0) {
-        (void)m_pOutputFifo->write(buffer, copyCount);
-        // we advance the frame only by the samples we have actually copied
-        // This means in case of buffer full (where we loose some frames)
-        // we do not get out of sync, and the syncing code tries to catch up the
-        // stream by writing silence, once the buffer is free.
-        m_streamFramesWritten += copyCount / m_numOutputChannels;
+        worker->startStream(m_sampleRate, m_numOutputChannels);
     }
 }
 
-void EngineNetworkStream::writeSilence(int frames) {
-    if (m_pWorker.isNull()) {
-        return;
-    }
-    //qDebug() << "EngineNetworkStream::writeSilence()" << frames;
-    if (!m_pWorker->threadWaiting()) {
-        // no thread waiting, so we can advance the stream without
-        // buffering
-        m_streamFramesWritten += frames;
-        return;
-    }
-    int writeAvailable = m_pOutputFifo->writeAvailable();
-    int writeRequired = frames * m_numOutputChannels;
-    if (writeAvailable < writeRequired) {
-        qDebug() << "EngineNetworkStream::writeSilence() buffer full";
-        NetworkStreamWorker::debugState();
-    }
-    int clearCount = math_min(writeAvailable, writeRequired);
-    if (clearCount > 0) {
-        CSAMPLE* dataPtr1;
-        ring_buffer_size_t size1;
-        CSAMPLE* dataPtr2;
-        ring_buffer_size_t size2;
-        (void)m_pOutputFifo->aquireWriteRegions(clearCount,
-                &dataPtr1, &size1, &dataPtr2, &size2);
-        SampleUtil::clear(dataPtr1,size1);
-        if (size2 > 0) {
-            SampleUtil::clear(dataPtr2,size2);
+void EngineNetworkStream::stopStream() {
+    m_inputStreamStartTimeUs = -1;
+
+    for(NetworkOutputStreamWorkerPtr worker : m_outputWorkers) {
+        if (worker.isNull()) {
+            continue;
         }
-        m_pOutputFifo->releaseWriteRegions(clearCount);
 
-        // we advance the frame only by the samples we have actually cleared
-        m_streamFramesWritten += clearCount / m_numOutputChannels;
+        worker->stopStream();
     }
 }
 
-void EngineNetworkStream::writingDone(int interval) {
-    // Signal worker if any
-    if (m_pWorker.isNull()) {
-        return;
-    }
-    // Check for desired kNetworkLatencyFrames + 1/2 interval to
-    // avoid big jitter due to interferences with sync code
-    if (m_pOutputFifo->readAvailable() + interval / 2
-            >= (m_numOutputChannels * kNetworkLatencyFrames)) {
-        m_pWorker->outputAvailable();
-    }
+int EngineNetworkStream::getReadExpected() {
+    return static_cast<int>(getInputStreamTimeFrames() - m_inputStreamFramesRead);
 }
 
 void EngineNetworkStream::read(CSAMPLE* buffer, int frames) {
-    int readAvailable = m_pOutputFifo->readAvailable();
+    int readAvailable = m_pInputFifo->readAvailable();
     int readRequired = frames * m_numInputChannels;
     int copyCount = math_min(readAvailable, readRequired);
     if (copyCount > 0) {
-        (void)m_pOutputFifo->read(buffer, copyCount);
+        (void)m_pInputFifo->read(buffer, copyCount);
         buffer += copyCount;
     }
     if (readAvailable < readRequired) {
         // Fill missing Samples with silence
         int silenceCount = readRequired - readAvailable;
-        qDebug() << "EngineNetworkStream::write flushed" << readRequired
-                 << "samples";
+        kLogger.debug() << "write: flushed"
+                        << readRequired << "samples";
         SampleUtil::clear(buffer, silenceCount);
     }
 }
 
-qint64 EngineNetworkStream::getStreamTimeFrames() {
-    return static_cast<double>(getStreamTimeUs()) * m_sampleRate / 1000000.0;
+qint64 EngineNetworkStream::getInputStreamTimeFrames() {
+    return static_cast<double>(getInputStreamTimeUs()) * m_sampleRate / 1000000.0;
 }
 
-qint64 EngineNetworkStream::getStreamTimeUs() {
-    return getNetworkTimeUs() - m_streamStartTimeUs;
+qint64 EngineNetworkStream::getInputStreamTimeUs() {
+    return getNetworkTimeUs() - m_inputStreamStartTimeUs;
 }
 
 // static
@@ -245,9 +181,52 @@ qint64 EngineNetworkStream::getNetworkTimeUs() {
 #endif
 }
 
-void EngineNetworkStream::addWorker(QSharedPointer<NetworkStreamWorker> pWorker) {
-    m_pWorker = pWorker;
-    if (m_pWorker) {
-        m_pWorker->setOutputFifo(m_pOutputFifo);
+void EngineNetworkStream::addOutputWorker(NetworkOutputStreamWorkerPtr pWorker) {
+    if (nextOutputSlotAvailable() < 0) {
+        kLogger.warning() << "addWorker: can't add worker:"
+                          << "no free slot left in internal list";
+        return;
+    }
+
+    if (pWorker && m_numOutputChannels) {
+        int nextNullItem = nextOutputSlotAvailable();
+        if(nextNullItem > -1) {
+            QSharedPointer<FIFO<CSAMPLE>> workerFifo(
+                    new FIFO<CSAMPLE>(m_numOutputChannels * kBufferFrames));
+            pWorker->setOutputFifo(workerFifo);
+            pWorker->startStream(m_sampleRate, m_numOutputChannels);
+            m_outputWorkers[nextNullItem] = pWorker;
+
+            kLogger.debug() << "addWorker: worker added";
+            debugOutputSlots();
+        }
     }
 }
+
+void EngineNetworkStream::removeOutputWorker(NetworkOutputStreamWorkerPtr pWorker) {
+    int index = m_outputWorkers.indexOf(pWorker);
+    if(index > -1) {
+        m_outputWorkers[index].clear();
+        kLogger.debug() << "removeWorker: worker removed";
+    } else {
+        kLogger.warning() << "removeWorker: ERROR: worker not found";
+    }
+    debugOutputSlots();
+}
+
+void EngineNetworkStream::setInputWorker(NetworkInputStreamWorker* pInputWorker) {
+    if (pInputWorker) {
+        pInputWorker->setSourceFifo(m_pInputFifo);
+    }
+}
+
+int EngineNetworkStream::nextOutputSlotAvailable() {
+    return m_outputWorkers.indexOf(NetworkOutputStreamWorkerPtr(nullptr));
+}
+
+void EngineNetworkStream::debugOutputSlots() {
+    int available = m_outputWorkers.count(NetworkOutputStreamWorkerPtr(nullptr));
+    int total = m_outputWorkers.size();
+    kLogger.debug() << "worker slots used:"
+                    << QString("%1 out of %2").arg(total - available).arg(total);
+}
diff --git a/src/engine/sidechain/enginenetworkstream.h b/src/engine/sidechain/enginenetworkstream.h
index 5d346128adc..468df76d721 100644
--- a/src/engine/sidechain/enginenetworkstream.h
+++ b/src/engine/sidechain/enginenetworkstream.h
@@ -1,9 +1,12 @@
 #ifndef ENGINENETWORKSTREAM_H_
 #define ENGINENETWORKSTREAM_H_
 
+#include <engine/sidechain/networkoutputstreamworker.h>
+#include <engine/sidechain/networkinputstreamworker.h>
+#include <QVector>
+
 #include "util/types.h"
 #include "util/fifo.h"
-#include "engine/sidechain/networkstreamworker.h"
 
 class EngineNetworkStream {
   public:
@@ -14,17 +17,11 @@ class EngineNetworkStream {
     void startStream(double sampleRate);
     void stopStream();
 
-    int getWriteExpected();
     int getReadExpected();
-
-    void write(const CSAMPLE* buffer, int frames);
     void read(CSAMPLE* buffer, int frames);
-    void writeSilence(int frames);
-
-    void writingDone(int interval);
 
-    qint64 getStreamTimeUs();
-    qint64 getStreamTimeFrames();
+    qint64 getInputStreamTimeUs();
+    qint64 getInputStreamTimeFrames();
 
     int getNumOutputChannels() {
         return m_numOutputChannels;
@@ -36,20 +33,35 @@ class EngineNetworkStream {
 
     static qint64 getNetworkTimeUs();
 
-    void addWorker(QSharedPointer<NetworkStreamWorker> pWorker);
+    void addOutputWorker(NetworkOutputStreamWorkerPtr pWorker);
+    void removeOutputWorker(NetworkOutputStreamWorkerPtr pWorker);
+    void setInputWorker(NetworkInputStreamWorker* pInputWorker);
+
+    QVector<NetworkOutputStreamWorkerPtr> outputWorkers() {
+        return m_outputWorkers;
+    }
 
   private:
+    int nextOutputSlotAvailable();
+    void debugOutputSlots();
 
-    FIFO<CSAMPLE>* m_pOutputFifo;
     FIFO<CSAMPLE>* m_pInputFifo;
     int m_numOutputChannels;
     int m_numInputChannels;
     double m_sampleRate;
-    qint64 m_streamStartTimeUs;
-    qint64 m_streamFramesWritten;
-    qint64 m_streamFramesRead;
-    QSharedPointer<NetworkStreamWorker> m_pWorker;
-    int m_writeOverflowCount;
+    qint64 m_inputStreamStartTimeUs;
+    qint64 m_inputStreamFramesWritten;
+    qint64 m_inputStreamFramesRead;
+
+    // EngineNetworkStream can't use locking mechanisms to protect its
+    // internal worker list against concurrency issues, as it is used by
+    // methods called from the audio engine thread.
+    // Instead, the internal list has a fixed number of QSharedPointers
+    // (which are thread-safe) initialized with null pointers. R/W operations to
+    // the workers are then performed on thread-safe QSharedPointers and not
+    // onto the thread-unsafe QVector
+    QVector<NetworkOutputStreamWorkerPtr> m_outputWorkers;
+    NetworkInputStreamWorker* m_pInputWorker;
 };
 
 #endif /* ENGINENETWORKSTREAM_H_ */
diff --git a/src/engine/sidechain/networkinputstreamworker.cpp b/src/engine/sidechain/networkinputstreamworker.cpp
new file mode 100644
index 00000000000..e25adc9cc65
--- /dev/null
+++ b/src/engine/sidechain/networkinputstreamworker.cpp
@@ -0,0 +1,16 @@
+// networkinputstreamworker.cpp
+// Create on August 11, 2017 by Palakis
+
+#include <engine/sidechain/networkinputstreamworker.h>
+
+NetworkInputStreamWorker::NetworkInputStreamWorker()
+    : m_sampleRate(0),
+      m_numInputChannels(0) {
+}
+
+NetworkInputStreamWorker::~NetworkInputStreamWorker() {
+}
+
+void NetworkInputStreamWorker::setSourceFifo(FIFO<CSAMPLE>* pFifo) {
+    (void)pFifo;
+}
diff --git a/src/engine/sidechain/networkinputstreamworker.h b/src/engine/sidechain/networkinputstreamworker.h
new file mode 100644
index 00000000000..57ca255a1a8
--- /dev/null
+++ b/src/engine/sidechain/networkinputstreamworker.h
@@ -0,0 +1,22 @@
+// networkinputstreamworker.h
+// Create on August 11, 2017 by Palakis
+
+#ifndef ENGINE_SIDECHAIN_NETWORKINPUTSTREAMWORKER_H
+#define ENGINE_SIDECHAIN_NETWORKINPUTSTREAMWORKER_H
+
+#include "util/fifo.h"
+#include "util/sample.h"
+
+class NetworkInputStreamWorker {
+  public:
+    NetworkInputStreamWorker();
+    virtual ~NetworkInputStreamWorker();
+
+    void setSourceFifo(FIFO<CSAMPLE>* pFifo);
+
+  private:
+    double m_sampleRate;
+    int m_numInputChannels;
+};
+
+#endif // ENGINE_SIDECHAIN_NETWORKINPUTSTREAMWORKER_H
diff --git a/src/engine/sidechain/networkoutputstreamworker.cpp b/src/engine/sidechain/networkoutputstreamworker.cpp
new file mode 100644
index 00000000000..0a18d760a33
--- /dev/null
+++ b/src/engine/sidechain/networkoutputstreamworker.cpp
@@ -0,0 +1,126 @@
+#include <engine/sidechain/networkoutputstreamworker.h>
+#include "engine/sidechain/enginenetworkstream.h"
+#include "util/logger.h"
+#include "util/sample.h"
+
+
+namespace {
+const mixxx::Logger kLogger("NetworkStreamWorker");
+}
+
+NetworkOutputStreamWorker::NetworkOutputStreamWorker()
+    : m_sampleRate(0),
+      m_numOutputChannels(0),
+      m_workerState(NETWORKSTREAMWORKER_STATE_NEW),
+      m_functionCode(0),
+      m_runCount(0),
+      m_streamStartTimeUs(-1),
+      m_streamFramesWritten(0),
+      m_writeOverflowCount(0),
+      m_outputDrift(false) {
+}
+
+NetworkOutputStreamWorker::~NetworkOutputStreamWorker() {
+}
+
+void NetworkOutputStreamWorker::outputAvailable() {
+}
+
+void NetworkOutputStreamWorker::setOutputFifo(QSharedPointer<FIFO<CSAMPLE>> pOutputFifo) {
+    Q_UNUSED(pOutputFifo);
+}
+
+QSharedPointer<FIFO<CSAMPLE>> NetworkOutputStreamWorker::getOutputFifo() {
+    return QSharedPointer<FIFO<CSAMPLE>>();
+}
+
+void NetworkOutputStreamWorker::startStream(double samplerate, int numOutputChannels) {
+    m_sampleRate = samplerate;
+    m_numOutputChannels = numOutputChannels;
+
+    m_streamStartTimeUs = EngineNetworkStream::getNetworkTimeUs();
+    m_streamFramesWritten = 0;
+}
+
+void NetworkOutputStreamWorker::stopStream() {
+    m_sampleRate = 0;
+    m_numOutputChannels = 0;
+
+    m_streamStartTimeUs = -1;
+}
+
+bool NetworkOutputStreamWorker::threadWaiting() {
+    return false;
+}
+
+qint64 NetworkOutputStreamWorker::getStreamTimeFrames() {
+    return static_cast<double>(getStreamTimeUs()) * m_sampleRate / 1000000.0;
+}
+
+qint64 NetworkOutputStreamWorker::getStreamTimeUs() {
+    return EngineNetworkStream::getNetworkTimeUs() - m_streamStartTimeUs;
+}
+
+void NetworkOutputStreamWorker::resetFramesWritten() {
+    m_streamFramesWritten = 0;
+}
+
+void NetworkOutputStreamWorker::addFramesWritten(qint64 frames) {
+    m_streamFramesWritten += frames;
+}
+
+qint64 NetworkOutputStreamWorker::framesWritten() {
+    return m_streamFramesWritten;
+}
+
+void NetworkOutputStreamWorker::resetOverflowCount() {
+    m_writeOverflowCount = 0;
+}
+
+void NetworkOutputStreamWorker::incOverflowCount() {
+    m_writeOverflowCount++;
+}
+
+int NetworkOutputStreamWorker::overflowCount() {
+    return m_writeOverflowCount;
+}
+
+void NetworkOutputStreamWorker::setOutputDrift(bool drift) {
+    m_outputDrift = drift;
+}
+
+bool NetworkOutputStreamWorker::outputDrift() {
+    return m_outputDrift;
+}
+
+int NetworkOutputStreamWorker::getState() {
+    return m_workerState;
+}
+
+int NetworkOutputStreamWorker::getFunctionCode() {
+    return m_functionCode;
+}
+
+int NetworkOutputStreamWorker::getRunCount() {
+    return m_runCount;
+}
+
+void NetworkOutputStreamWorker::debugState() {
+    kLogger.debug()
+            << "NetworkStreamWorker state:"
+            << m_workerState
+            << m_functionCode
+            << m_runCount;
+}
+
+void NetworkOutputStreamWorker::setState(int state) {
+    m_workerState = state;
+}
+
+void NetworkOutputStreamWorker::setFunctionCode(int code) {
+    m_functionCode = code;
+}
+
+void NetworkOutputStreamWorker::incRunCount() {
+    m_runCount++;
+}
diff --git a/src/engine/sidechain/networkstreamworker.h b/src/engine/sidechain/networkoutputstreamworker.h
similarity index 59%
rename from src/engine/sidechain/networkstreamworker.h
rename to src/engine/sidechain/networkoutputstreamworker.h
index 55e588c0e56..ac167874a62 100644
--- a/src/engine/sidechain/networkstreamworker.h
+++ b/src/engine/sidechain/networkoutputstreamworker.h
@@ -1,5 +1,7 @@
-#ifndef NETWORKSTREAMWORKER_H
-#define NETWORKSTREAMWORKER_H
+#ifndef NETWORKOUTPUTSTREAMWORKER_H
+#define NETWORKOUTPUTSTREAMWORKER_H
+
+#include <QSharedPointer>
 
 #include "util/types.h"
 #include "util/fifo.h"
@@ -25,7 +27,7 @@
  * should support state handling at least this NETWORKSTREAMWORKER_STATE_READY state.
  */
 
-enum NetworkStreamWorkerStates {
+enum NetworkOutputStreamWorkerStates {
     NETWORKSTREAMWORKER_STATE_ERROR = -1,
     NETWORKSTREAMWORKER_STATE_NEW,
     NETWORKSTREAMWORKER_STATE_INIT,
@@ -39,24 +41,42 @@ enum NetworkStreamWorkerStates {
     NETWORKSTREAMWORKER_STATE_DISCONNECTED
 };
 
-class NetworkStreamWorker {
+class NetworkOutputStreamWorker {
   public:
-    NetworkStreamWorker();
-    virtual ~NetworkStreamWorker();
+    NetworkOutputStreamWorker();
+    virtual ~NetworkOutputStreamWorker();
 
     virtual void process(const CSAMPLE* pBuffer, const int iBufferSize) = 0;
     virtual void shutdown() = 0;
 
     virtual void outputAvailable();
-    virtual void setOutputFifo(FIFO<CSAMPLE>* pOutputFifo);
+    virtual void setOutputFifo(QSharedPointer<FIFO<CSAMPLE>> pOutputFifo);
+    virtual QSharedPointer<FIFO<CSAMPLE>> getOutputFifo();
+
+    void startStream(double samplerate, int numOutputChannels);
+    void stopStream();
 
     virtual bool threadWaiting();
 
-    static int getState();
-    static int getFunctionCode();
-    static int getRunCount();
+    qint64 getStreamTimeUs();
+    qint64 getStreamTimeFrames();
+
+    void resetFramesWritten();
+    void addFramesWritten(qint64 frames);
+    qint64 framesWritten();
+
+    void resetOverflowCount();
+    void incOverflowCount();
+    int overflowCount();
 
-    static void debugState();
+    void setOutputDrift(bool drift);
+    bool outputDrift();
+
+    int getState();
+    int getFunctionCode();
+    int getRunCount();
+
+    void debugState();
 
 protected:
     void setState(int state);
@@ -64,10 +84,19 @@ class NetworkStreamWorker {
     void incRunCount();
     
 private:
-    static int s_networkStreamWorkerState;
-    static int s_functionCode;
-    static int s_runCount;
+    double m_sampleRate;
+    int m_numOutputChannels;
+
+    int m_workerState;
+    int m_functionCode;
+    int m_runCount;
+
+    qint64 m_streamStartTimeUs;
+    qint64 m_streamFramesWritten;
+    int m_writeOverflowCount;
+    bool m_outputDrift;
 };
 
+typedef QSharedPointer<NetworkOutputStreamWorker> NetworkOutputStreamWorkerPtr;
 
 #endif /* NETWORKSTREAMWORKER_H */
diff --git a/src/engine/sidechain/networkstreamworker.cpp b/src/engine/sidechain/networkstreamworker.cpp
deleted file mode 100644
index 91a3cbbd175..00000000000
--- a/src/engine/sidechain/networkstreamworker.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "networkstreamworker.h"
-
-int NetworkStreamWorker::s_networkStreamWorkerState = NETWORKSTREAMWORKER_STATE_NEW;
-int NetworkStreamWorker::s_functionCode = 0;
-int NetworkStreamWorker::s_runCount = 0;
-
-NetworkStreamWorker::NetworkStreamWorker() {
-}
-
-NetworkStreamWorker::~NetworkStreamWorker() {
-}
-
-void NetworkStreamWorker::outputAvailable() {
-}
-
-void NetworkStreamWorker::setOutputFifo(FIFO<CSAMPLE>* pOutputFifo) {
-    Q_UNUSED(pOutputFifo);
-}
-
-bool NetworkStreamWorker::threadWaiting() {
-    return false;
-}
-
-int NetworkStreamWorker::getState() {
-    return s_networkStreamWorkerState;
-}
-
-int NetworkStreamWorker::getFunctionCode() {
-    return s_functionCode;
-}
-
-int NetworkStreamWorker::getRunCount() {
-    return s_runCount;
-}
-
-void NetworkStreamWorker::debugState() {
-    qDebug() << "NetworkStreamWorker state:"
-             << s_networkStreamWorkerState
-             << s_functionCode
-             << s_runCount;
-}
-
-void NetworkStreamWorker::setState(int state) {
-    s_networkStreamWorkerState = state;
-}
-
-void NetworkStreamWorker::setFunctionCode(int code) {
-    s_functionCode = code;
-}
-
-void NetworkStreamWorker::incRunCount() {
-    s_runCount++;
-}
diff --git a/src/engine/sidechain/enginebroadcast.cpp b/src/engine/sidechain/shoutconnection.cpp
similarity index 74%
rename from src/engine/sidechain/enginebroadcast.cpp
rename to src/engine/sidechain/shoutconnection.cpp
index b01a2b57e3d..3c4d463cd18 100644
--- a/src/engine/sidechain/enginebroadcast.cpp
+++ b/src/engine/sidechain/shoutconnection.cpp
@@ -1,7 +1,13 @@
-#include <QtDebug>
+// shoutconnection.cpp
+// Created July 4th 2017 by Stéphane Lepin <stephane.lepin@gmail.com>
+
 #include <QUrl>
 
+// These includes are only required by ignoreSigpipe, which is unix-only
+#ifndef __WINDOWS__
 #include <signal.h>
+#include <unistd.h>
+#endif
 
 // shout.h checks for WIN32 to see if we are on Windows.
 #ifdef WIN64
@@ -12,8 +18,6 @@
 #undef WIN32
 #endif
 
-#include "engine/sidechain/enginebroadcast.h"
-
 #include "broadcast/defs_broadcast.h"
 #include "control/controlpushbutton.h"
 #include "encoder/encoder.h"
@@ -21,16 +25,23 @@
 #include "mixer/playerinfo.h"
 #include "preferences/usersettings.h"
 #include "recording/defs_recording.h"
-
 #include "track/track.h"
+#include "util/logger.h"
+
+#include <engine/sidechain/shoutconnection.h>
 
+namespace {
 static const int kConnectRetries = 30;
 static const int kMaxNetworkCache = 491520;  // 10 s mp3 @ 192 kbit/s
 // Shoutcast default receive buffer 1048576 and autodumpsourcetime 30 s
 // http://wiki.shoutcast.com/wiki/SHOUTcast_DNAS_Server_2
 static const int kMaxShoutFailures = 3;
 
-EngineBroadcast::EngineBroadcast(UserSettingsPointer pConfig)
+const mixxx::Logger kLogger("ShoutConnection");
+}
+
+ShoutConnection::ShoutConnection(BroadcastProfilePtr profile,
+        UserSettingsPointer pConfig)
         : m_pTextCodec(nullptr),
           m_pMetaData(),
           m_pShout(nullptr),
@@ -38,10 +49,11 @@ EngineBroadcast::EngineBroadcast(UserSettingsPointer pConfig)
           m_iMetaDataLife(0),
           m_iShoutStatus(0),
           m_iShoutFailures(0),
-          m_settings(pConfig),
           m_pConfig(pConfig),
+          m_pProfile(profile),
           m_encoder(nullptr),
           m_pMasterSamplerate(new ControlProxy("[Master]", "samplerate")),
+          m_pBroadcastEnabled(new ControlProxy(BROADCAST_PREF_KEY, "enabled")),
           m_custom_metadata(false),
           m_firstCall(false),
           m_format_is_mp3(false),
@@ -51,29 +63,16 @@ EngineBroadcast::EngineBroadcast(UserSettingsPointer pConfig)
           m_protocol_is_shoutcast(false),
           m_ogg_dynamic_update(false),
           m_threadWaiting(false),
-          m_pOutputFifo(nullptr),
           m_retryCount(0),
           m_reconnectFirstDelay(0.0),
           m_reconnectPeriod(5.0),
           m_noDelayFirstReconnect(true),
           m_limitReconnects(true),
           m_maximumRetries(10) {
-    const bool persist = true;
-    m_pBroadcastEnabled = new ControlPushButton(
-            ConfigKey(BROADCAST_PREF_KEY,"enabled"), persist);
-    m_pBroadcastEnabled->setButtonMode(ControlPushButton::TOGGLE);
-    connect(m_pBroadcastEnabled, SIGNAL(valueChanged(double)),
-            this, SLOT(slotEnableCO(double)));
-
-    m_pStatusCO = new ControlObject(ConfigKey(BROADCAST_PREF_KEY, "status"));
-    m_pStatusCO->setReadOnly();
-    m_pStatusCO->forceSet(STATUSCO_UNCONNECTED);
-
+    setStatus(BroadcastProfile::STATUS_UNCONNECTED);
     setState(NETWORKSTREAMWORKER_STATE_INIT);
 
-    // Initialize libshout
-    shout_init();
-
+    // shout_init() should've already been called by now
     if (!(m_pShout = shout_new())) {
         errorDialog(tr("Mixxx encountered a problem"),
                 tr("Could not allocate shout_t"));
@@ -91,9 +90,16 @@ EngineBroadcast::EngineBroadcast(UserSettingsPointer pConfig)
     }
 }
 
-EngineBroadcast::~EngineBroadcast() {
-    m_pBroadcastEnabled->set(0);
-    m_readSema.release();
+ShoutConnection::~ShoutConnection() {
+    delete m_pMasterSamplerate;
+
+    if (m_pShoutMetaData)
+        shout_metadata_free(m_pShoutMetaData);
+
+    if (m_pShout) {
+        shout_close(m_pShout);
+        shout_free(m_pShout);
+    }
 
     // Wait maximum ~4 seconds. User will get annoyed but
     // if there is some network problems we let them settle
@@ -101,24 +107,12 @@ EngineBroadcast::~EngineBroadcast() {
 
     // Signal user if thread doesn't die
     VERIFY_OR_DEBUG_ASSERT(!isRunning()) {
-       qWarning() << "EngineBroadcast:~EngineBroadcast(): Thread didn't die.\
+       qWarning() << "ShoutOutput::~ShoutOutput(): Thread didn't die.\
        Ignored but file a bug report if problems rise!";
     }
-
-    delete m_pStatusCO;
-    delete m_pMasterSamplerate;
-
-    if (m_pShoutMetaData) {
-        shout_metadata_free(m_pShoutMetaData);
-    }
-    if (m_pShout) {
-        shout_close(m_pShout);
-        shout_free(m_pShout);
-    }
-    shout_shutdown();
 }
 
-bool EngineBroadcast::isConnected() {
+bool ShoutConnection::isConnected() {
     if (m_pShout) {
         m_iShoutStatus = shout_get_connected(m_pShout);
         if (m_iShoutStatus == SHOUTERR_CONNECTED)
@@ -127,23 +121,42 @@ bool EngineBroadcast::isConnected() {
     return false;
 }
 
-QByteArray EngineBroadcast::encodeString(const QString& string) {
+// Only called when applying settings while broadcasting is active
+void ShoutConnection::applySettings() {
+    // Do nothing if profile or Live Broadcasting is disabled
+    if(!m_pBroadcastEnabled->toBool()
+            || !m_pProfile->getEnabled())
+        return;
+
+    // Setting the profile's enabled value to false tells the
+    // connection's thread to exit, so no need to call
+    // processDisconnect manually
+
+    int dStatus = getStatus();
+    if((dStatus == BroadcastProfile::STATUS_UNCONNECTED
+            || dStatus == BroadcastProfile::STATUS_FAILURE)) {
+        serverConnect();
+    }
+}
+
+QByteArray ShoutConnection::encodeString(const QString& string) {
     if (m_pTextCodec) {
         return m_pTextCodec->fromUnicode(string);
     }
     return string.toLatin1();
 }
 
-void EngineBroadcast::updateFromPreferences() {
-    qDebug() << "EngineBroadcast: updating from preferences";
-    NetworkStreamWorker::debugState();
-
-    double dStatus = m_pStatusCO->get();
-    if (dStatus == STATUSCO_CONNECTED ||
-            dStatus == STATUSCO_CONNECTING) {
-        qDebug() << "EngineBroadcast::updateFromPreferences status:"
-                 << dStatus
-                 << ". Can't edit preferences when playing";
+void ShoutConnection::updateFromPreferences() {
+    kLogger.debug() << m_pProfile->getProfileName()
+                    << ": updating from preferences";
+
+    int dStatus = getStatus();
+    if (dStatus == BroadcastProfile::STATUS_CONNECTED ||
+            dStatus == BroadcastProfile::STATUS_CONNECTING) {
+        kLogger.warning()
+                << m_pProfile->getProfileName()
+                << "updateFromPreferences status:" << dStatus
+                << ". Can't edit preferences when playing";
         return;
     }
 
@@ -164,20 +177,21 @@ void EngineBroadcast::updateFromPreferences() {
     // Convert a bunch of QStrings to QByteArrays so we can get regular C char*
     // strings to pass to libshout.
 
-    QString codec = m_settings.getMetadataCharset();
+    QString codec = m_pProfile->getMetadataCharset();
     QByteArray baCodec = codec.toLatin1();
     m_pTextCodec = QTextCodec::codecForName(baCodec);
     if (!m_pTextCodec) {
-        qDebug() << "Couldn't find broadcast metadata codec for codec:" << codec
-                 << " defaulting to ISO-8859-1.";
+        kLogger.warning()
+                << "Couldn't find broadcast metadata codec for codec:" << codec
+                << " defaulting to ISO-8859-1.";
     }
 
     // Indicates our metadata is in the provided charset.
     shout_metadata_add(m_pShoutMetaData, "charset",  baCodec.constData());
 
-    QString serverType = m_settings.getServertype();
+    QString serverType = m_pProfile->getServertype();
 
-    QString host = m_settings.getHost();
+    QString host = m_pProfile->getHost();
     int start = host.indexOf(QLatin1String("//"));
     if (start == -1) {
         // the host part requires preceding //.
@@ -187,10 +201,10 @@ void EngineBroadcast::updateFromPreferences() {
     }
     QUrl serverUrl = host;
 
-    int port = m_settings.getPort();
+    int port = m_pProfile->getPort();
     serverUrl.setPort(port);
 
-    QString mountPoint = m_settings.getMountpoint();
+    QString mountPoint = m_pProfile->getMountpoint();
     if (!mountPoint.isEmpty()) {
         if (!mountPoint.startsWith('/')) {
             mountPoint.prepend('/');
@@ -198,43 +212,43 @@ void EngineBroadcast::updateFromPreferences() {
         serverUrl.setPath(mountPoint);
     }
 
-    QString login = m_settings.getLogin();
+    QString login = m_pProfile->getLogin();
     if (!login.isEmpty()) {
         serverUrl.setUserName(login);
     }
 
-    qDebug() << "Using server URL:" << serverUrl;
+    kLogger.debug() << "Using server URL:" << serverUrl;
 
-    QByteArray baPassword = m_settings.getPassword().toLatin1();
-    QByteArray baFormat = m_settings.getFormat().toLatin1();
-    int iBitrate = m_settings.getBitrate();
+    QByteArray baPassword = m_pProfile->getPassword().toLatin1();
+    QByteArray baFormat = m_pProfile->getFormat().toLatin1();
+    int iBitrate = m_pProfile->getBitrate();
 
     // Encode metadata like stream name, website, desc, genre, title/author with
     // the chosen TextCodec.
-    QByteArray baStreamName = encodeString(m_settings.getStreamName());
-    QByteArray baStreamWebsite = encodeString(m_settings.getStreamWebsite());
-    QByteArray baStreamDesc = encodeString(m_settings.getStreamDesc());
-    QByteArray baStreamGenre = encodeString(m_settings.getStreamGenre());
+    QByteArray baStreamName = encodeString(m_pProfile->getStreamName());
+    QByteArray baStreamWebsite = encodeString(m_pProfile->getStreamWebsite());
+    QByteArray baStreamDesc = encodeString(m_pProfile->getStreamDesc());
+    QByteArray baStreamGenre = encodeString(m_pProfile->getStreamGenre());
 
     // Whether the stream is public.
-    bool streamPublic = m_settings.getStreamPublic();
+    bool streamPublic = m_pProfile->getStreamPublic();
 
     // Dynamic Ogg metadata update
-    m_ogg_dynamic_update = m_settings.getOggDynamicUpdate();
+    m_ogg_dynamic_update = m_pProfile->getOggDynamicUpdate();
 
-    m_custom_metadata = m_settings.getEnableMetadata();
-    m_customTitle = m_settings.getCustomTitle();
-    m_customArtist = m_settings.getCustomArtist();
+    m_custom_metadata = m_pProfile->getEnableMetadata();
+    m_customTitle = m_pProfile->getCustomTitle();
+    m_customArtist = m_pProfile->getCustomArtist();
 
-    m_metadataFormat = m_settings.getMetadataFormat();
+    m_metadataFormat = m_pProfile->getMetadataFormat();
 
-    bool enableReconnect = m_settings.getEnableReconnect();
+    bool enableReconnect = m_pProfile->getEnableReconnect();
     if (enableReconnect) {
-        m_reconnectFirstDelay = m_settings.getReconnectFirstDelay();
-        m_reconnectPeriod = m_settings.getReconnectPeriod();
-        m_noDelayFirstReconnect = m_settings.getNoDelayFirstReconnect();
-        m_limitReconnects = m_settings.getLimitReconnects();
-        m_maximumRetries = m_settings.getMaximumRetries();
+        m_reconnectFirstDelay = m_pProfile->getReconnectFirstDelay();
+        m_reconnectPeriod = m_pProfile->getReconnectPeriod();
+        m_noDelayFirstReconnect = m_pProfile->getNoDelayFirstReconnect();
+        m_limitReconnects = m_pProfile->getLimitReconnects();
+        m_maximumRetries = m_pProfile->getMaximumRetries();
     } else {
         m_limitReconnects = true;
         m_maximumRetries = 0;
@@ -340,7 +354,6 @@ void EngineBroadcast::updateFromPreferences() {
     m_protocol_is_shoutcast = serverType == BROADCAST_SERVER_SHOUTCAST;
     m_protocol_is_icecast1 = serverType == BROADCAST_SERVER_ICECAST1;
 
-
     if (m_protocol_is_icecast2) {
         protocol = SHOUT_PROTOCOL_HTTP;
     } else if (m_protocol_is_shoutcast) {
@@ -364,7 +377,7 @@ void EngineBroadcast::updateFromPreferences() {
     }
 
     // Initialize m_encoder
-    EncoderBroadcastSettings broadcastSettings(m_settings);
+    EncoderBroadcastSettings broadcastSettings(m_pProfile);
     if (m_format_is_mp3) {
         m_encoder = EncoderFactory::getFactory().getNewEncoder(
             EncoderFactory::getFactory().getFormatFor(ENCODING_MP3), m_pConfig, this);
@@ -374,7 +387,7 @@ void EngineBroadcast::updateFromPreferences() {
             EncoderFactory::getFactory().getFormatFor(ENCODING_OGG), m_pConfig, this);
         m_encoder->setEncoderSettings(broadcastSettings);
     } else {
-        qDebug() << "**** Unknown Encoder Format";
+        kLogger.warning() << "**** Unknown Encoder Format";
         setState(NETWORKSTREAMWORKER_STATE_ERROR);
         m_lastErrorStr = "Encoder format error";
         return;
@@ -384,38 +397,44 @@ void EngineBroadcast::updateFromPreferences() {
     if(m_encoder->initEncoder(iMasterSamplerate, errorMsg) < 0) {
         // e.g., if lame is not found
         // init m_encoder itself will display a message box
-        qDebug() << "**** Encoder init failed";
-        qWarning() << errorMsg;
+        kLogger.warning() << "**** Encoder init failed";
+        kLogger.warning() << errorMsg;
+
         // delete m_encoder calls write() make sure it will be exit early
         DEBUG_ASSERT(m_iShoutStatus != SHOUTERR_CONNECTED);
         m_encoder.reset();
+
         setState(NETWORKSTREAMWORKER_STATE_ERROR);
         m_lastErrorStr = "Encoder error";
+
         return;
     }
     setState(NETWORKSTREAMWORKER_STATE_READY);
 }
 
-bool EngineBroadcast::serverConnect() {
+bool ShoutConnection::serverConnect() {
+    if(!m_pProfile->getEnabled())
+        return false;
+
     start(QThread::HighPriority);
     setState(NETWORKSTREAMWORKER_STATE_CONNECTING);
     return true;
 }
 
-bool EngineBroadcast::processConnect() {
-    qDebug() << "EngineBroadcast::processConnect()";
+bool ShoutConnection::processConnect() {
+    kLogger.debug() << "processConnect";
 
     // Make sure that we call updateFromPreferences always
     updateFromPreferences();
 
     if (!m_encoder) {
         // updateFromPreferences failed
-        m_pStatusCO->forceSet(STATUSCO_FAILURE);
-        qDebug() << "EngineBroadcast::processConnect() returning false";
+        setStatus(BroadcastProfile::STATUS_FAILURE);
+        kLogger.warning() << "ShoutOutput::processConnect() returning false";
         return false;
     }
 
-    m_pStatusCO->forceSet(STATUSCO_CONNECTING);
+    setStatus(BroadcastProfile::STATUS_CONNECTING);
     m_iShoutFailures = 0;
     m_lastErrorStr.clear();
     // set to a high number to automatically update the metadata
@@ -460,9 +479,10 @@ bool EngineBroadcast::processConnect() {
 
         m_iShoutFailures++;
         m_lastErrorStr = shout_get_error(m_pShout);
-        qDebug() << m_iShoutFailures << "/" << kMaxShoutFailures
-                 << "Streaming server failed connect. Failures:"
-                 << m_lastErrorStr;
+        kLogger.warning()
+                << m_iShoutFailures << "/" << kMaxShoutFailures
+                << "Streaming server failed connect. Failures:"
+                << m_lastErrorStr;
     }
 
     // If we don't have any fatal errors let's try to connect
@@ -474,10 +494,9 @@ bool EngineBroadcast::processConnect() {
         int timeout = 0;
         while (m_iShoutStatus == SHOUTERR_BUSY &&
                 timeout < kConnectRetries &&
-                m_pBroadcastEnabled->toBool()) {
-            setState(NETWORKSTREAMWORKER_STATE_WAITING);
-            qDebug() << "Connection pending. Waiting...";
-            NetworkStreamWorker::debugState();
+                m_pProfile->getEnabled()) {
+        	setState(NETWORKSTREAMWORKER_STATE_WAITING);
+            kLogger.debug() << "Connection pending. Waiting...";
             m_iShoutStatus = shout_get_connected(m_pShout);
 
             if (m_iShoutStatus != SHOUTERR_BUSY &&
@@ -496,27 +515,31 @@ bool EngineBroadcast::processConnect() {
             ++ timeout;
         }
         if (m_iShoutStatus == SHOUTERR_CONNECTED) {
-            setState(NETWORKSTREAMWORKER_STATE_READY);
-            qDebug() << "***********Connected to streaming server...";
+        	setState(NETWORKSTREAMWORKER_STATE_READY);
+            kLogger.debug() << "***********Connected to streaming server...";
 
             m_retryCount = 0;
 
-            if (m_pOutputFifo->readAvailable()) {
-                m_pOutputFifo->flushReadData(m_pOutputFifo->readAvailable());
+            if(m_pOutputFifo->readAvailable()) {
+            	m_pOutputFifo->flushReadData(m_pOutputFifo->readAvailable());
             }
             m_threadWaiting = true;
-            m_pStatusCO->forceSet(STATUSCO_CONNECTED);
+
+            setStatus(BroadcastProfile::STATUS_CONNECTED);
             emit(broadcastConnected());
-            qDebug() << "EngineBroadcast::processConnect() returning true";
+
+            kLogger.debug() << "processConnect() returning true";
             return true;
         } else if (m_iShoutStatus == SHOUTERR_SOCKET) {
             m_lastErrorStr = "Socket error";
-            qDebug() << "EngineBroadcast::processConnect() socket error."
-                     << "Is socket already in use?";
-        } else if (m_pBroadcastEnabled->toBool()) {
+            kLogger.warning()
+                    << "processConnect() socket error."
+                    << "Is socket already in use?";
+        } else if (m_pProfile->getEnabled()) {
             m_lastErrorStr = shout_get_error(m_pShout);
-            qDebug() << "EngineBroadcast::processConnect() error:"
-                     << m_iShoutStatus << m_lastErrorStr;
+            kLogger.warning()
+                    << "processConnect() error:"
+                    << m_iShoutStatus << m_lastErrorStr;
         }
     }
 
@@ -525,23 +548,25 @@ bool EngineBroadcast::processConnect() {
     // delete m_encoder calls write() check if it will be exit early
     DEBUG_ASSERT(m_iShoutStatus != SHOUTERR_CONNECTED);
     m_encoder.reset();
-    if (m_pBroadcastEnabled->toBool()) {
-        m_pStatusCO->forceSet(STATUSCO_FAILURE);
+    if (m_pProfile->getEnabled()) {
+        setStatus(BroadcastProfile::STATUS_FAILURE);
     } else {
-        m_pStatusCO->forceSet(STATUSCO_UNCONNECTED);
+        setStatus(BroadcastProfile::STATUS_UNCONNECTED);
     }
-    qDebug() << "EngineBroadcast::processConnect() returning false";
+    kLogger.debug() << "processConnect() returning false";
     return false;
 }
 
-bool EngineBroadcast::processDisconnect() {
-    qDebug() << "EngineBroadcast::processDisconnect()";
+bool ShoutConnection::processDisconnect() {
+    kLogger.debug() << "processDisconnect()";
     bool disconnected = false;
     if (isConnected()) {
-        m_threadWaiting = false;
+    	m_threadWaiting = false;
+
         // We are connected but broadcast is disabled. Disconnect.
         shout_close(m_pShout);
         m_iShoutStatus = SHOUTERR_UNCONNECTED;
+
         emit(broadcastDisconnected());
         disconnected = true;
     }
@@ -549,13 +574,12 @@ bool EngineBroadcast::processDisconnect() {
     DEBUG_ASSERT(m_iShoutStatus != SHOUTERR_CONNECTED);
     m_encoder.reset();
     return disconnected;
-
 }
 
-void EngineBroadcast::write(const unsigned char *header, const unsigned char *body,
+void ShoutConnection::write(const unsigned char* header, const unsigned char* body,
                             int headerLen, int bodyLen) {
     setFunctionCode(7);
-    if (!m_pShout || m_iShoutStatus != SHOUTERR_CONNECTED) {
+	if (!m_pShout || m_iShoutStatus != SHOUTERR_CONNECTED) {
         // This happens when the decoder calls flush() and the connection is
         // already down
         return;
@@ -574,8 +598,7 @@ void EngineBroadcast::write(const unsigned char *header, const unsigned char *bo
 
     ssize_t queuelen = shout_queuelen(m_pShout);
     if (queuelen > 0) {
-        qDebug() << "shout_queuelen" << queuelen;
-        NetworkStreamWorker::debugState();
+        kLogger.debug() << "shout_queuelen" << queuelen;
         if (queuelen > kMaxNetworkCache) {
             m_lastErrorStr = tr("Network cache overflow");
             tryReconnect();
@@ -583,38 +606,37 @@ void EngineBroadcast::write(const unsigned char *header, const unsigned char *bo
     }
 }
 // These are not used for streaming, but the interface requires them
-int EngineBroadcast::tell() {
+int ShoutConnection::tell() {
     if (!m_pShout) {
         return -1;
     }
     return -1;
 }
 // These are not used for streaming, but the interface requires them
-void EngineBroadcast::seek(int pos) {
+void ShoutConnection::seek(int pos) {
     Q_UNUSED(pos)
     return;
 }
 // These are not used for streaming, but the interface requires them
-int EngineBroadcast::filelen() {
+int ShoutConnection::filelen() {
     return 0;
 }
 
-bool EngineBroadcast::writeSingle(const unsigned char* data, size_t len) {
-    // We are already synced by EngineNetworkstream
+bool ShoutConnection::writeSingle(const unsigned char* data, size_t len) {
     setFunctionCode(8);
     int ret = shout_send_raw(m_pShout, data, len);
     if (ret == SHOUTERR_BUSY) {
         // in case of busy, frames are queued
         // try to flush queue after a short sleep
-        qDebug() << "EngineBroadcast::writeSingle() SHOUTERR_BUSY, trying again";
-        QThread::msleep(10); // wait 10 ms until "busy" is over. TODO() tweak for an optimum.
+        kLogger.warning() << "writeSingle() SHOUTERR_BUSY, trying again";
+        usleep(10000); // wait 10 ms until "busy" is over. TODO() tweak for an optimum.
         // if this fails, the queue is transmitted after the next regular shout_send_raw()
         (void)shout_send_raw(m_pShout, nullptr, 0);
     } else if (ret < SHOUTERR_SUCCESS) {
         m_lastErrorStr = shout_get_error(m_pShout);
-        qDebug() << "EngineBroadcast::writeSingle() error:"
-                 << ret << m_lastErrorStr;
-        NetworkStreamWorker::debugState();
+        kLogger.warning()
+                << "writeSingle() error:"
+                << ret << m_lastErrorStr;
         if (++m_iShoutFailures > kMaxShoutFailures) {
             tryReconnect();
         }
@@ -625,12 +647,12 @@ bool EngineBroadcast::writeSingle(const unsigned char* data, size_t len) {
     return true;
 }
 
-void EngineBroadcast::process(const CSAMPLE* pBuffer, const int iBufferSize) {
+void ShoutConnection::process(const CSAMPLE* pBuffer, const int iBufferSize) {
     setFunctionCode(4);
+    if(!m_pProfile->getEnabled())
+        return;
 
     setState(NETWORKSTREAMWORKER_STATE_BUSY);
-    // If we are here then the user wants to be connected (broadcast is enabled
-    // in the preferences).
 
     // If we aren't connected, bail.
     if (m_iShoutStatus != SHOUTERR_CONNECTED)
@@ -650,7 +672,7 @@ void EngineBroadcast::process(const CSAMPLE* pBuffer, const int iBufferSize) {
     setState(NETWORKSTREAMWORKER_STATE_READY);
 }
 
-bool EngineBroadcast::metaDataHasChanged() {
+bool ShoutConnection::metaDataHasChanged() {
     TrackPointer pTrack;
 
     // TODO(rryan): This is latency and buffer size dependent. Should be based
@@ -680,7 +702,7 @@ bool EngineBroadcast::metaDataHasChanged() {
     return true;
 }
 
-void EngineBroadcast::updateMetaData() {
+void ShoutConnection::updateMetaData() {
     setFunctionCode(5);
     if (!m_pShout || !m_pShoutMetaData)
         return;
@@ -718,7 +740,7 @@ void EngineBroadcast::updateMetaData() {
             // Also I do not know about icecast1. To be safe, i stick to the
             // old way for those use cases.
             if (!m_format_is_mp3 && m_protocol_is_icecast2) {
-                setFunctionCode(9);
+            	setFunctionCode(9);
                 shout_metadata_add(m_pShoutMetaData, "artist",  encodeString(artist).constData());
                 shout_metadata_add(m_pShoutMetaData, "title",  encodeString(title).constData());
             } else {
@@ -756,7 +778,6 @@ void EngineBroadcast::updateMetaData() {
             }
             setFunctionCode(11);
             shout_set_metadata(m_pShout, m_pShoutMetaData);
-
         }
     } else {
         // Otherwise we might use static metadata
@@ -765,7 +786,7 @@ void EngineBroadcast::updateMetaData() {
 
             // see comment above...
             if (!m_format_is_mp3 && m_protocol_is_icecast2) {
-                setFunctionCode(12);
+            	setFunctionCode(12);
                 shout_metadata_add(
                         m_pShoutMetaData,"artist",encodeString(m_customArtist).constData());
 
@@ -783,13 +804,14 @@ void EngineBroadcast::updateMetaData() {
     }
 }
 
-void EngineBroadcast::errorDialog(QString text, QString detailedError) {
+void ShoutConnection::errorDialog(QString text, QString detailedError) {
     qWarning() << "Streaming error: " << detailedError;
-    NetworkStreamWorker::debugState();
     ErrorDialogProperties* props = ErrorDialogHandler::instance()->newDialogProperties();
     props->setType(DLG_WARNING);
-    props->setTitle(tr("Live broadcasting"));
-    props->setText(text);
+    props->setTitle(tr("Connection error"));
+    props->setText(tr("One of the Live Broadcasting connections raised this error:<br>"
+            "<b>Error with connection '%1':</b><br>")
+            .arg(profile()->getProfileName()) + text);
     props->setDetails(detailedError);
     props->setKey(detailedError);   // To prevent multiple windows for the same error
     props->setDefaultButton(QMessageBox::Close);
@@ -798,70 +820,132 @@ void EngineBroadcast::errorDialog(QString text, QString detailedError) {
     setState(NETWORKSTREAMWORKER_STATE_ERROR);
 }
 
-void EngineBroadcast::infoDialog(QString text, QString detailedInfo) {
+void ShoutConnection::infoDialog(QString text, QString detailedInfo) {
     ErrorDialogProperties* props = ErrorDialogHandler::instance()->newDialogProperties();
     props->setType(DLG_INFO);
-    props->setTitle(tr("Live broadcasting"));
-    props->setText(text);
+    props->setTitle(tr("Connection message"));
+    props->setText(tr("<b>Message from Live Broadcasting connection '%1':</b><br>")
+            .arg(profile()->getProfileName()) + text);
     props->setDetails(detailedInfo);
     props->setKey(text + detailedInfo);
     props->setDefaultButton(QMessageBox::Close);
     props->setModal(false);
     ErrorDialogHandler::instance()->requestErrorDialog(props);
-    NetworkStreamWorker::debugState();
 }
 
-// Is called from the Mixxx engine thread
-void EngineBroadcast::outputAvailable() {
+bool ShoutConnection::waitForRetry() {
+    if (m_limitReconnects &&
+            m_retryCount >= m_maximumRetries) {
+        return false;
+    }
+    ++m_retryCount;
+
+    kLogger.debug() << "waitForRetry()" << m_retryCount << "/" << m_maximumRetries;
+
+    double delay;
+    if (m_retryCount == 1) {
+        delay = m_reconnectFirstDelay;
+    } else {
+        delay = m_reconnectPeriod;
+    }
+
+    if (delay > 0) {
+        m_enabledMutex.lock();
+        m_waitEnabled.wait(&m_enabledMutex, delay * 1000);
+        m_enabledMutex.unlock();
+        if (!m_pProfile->getEnabled()) {
+            return false;
+        }
+    }
+    return true;
+}
+
+void ShoutConnection::tryReconnect() {
+    QString originalErrorStr = m_lastErrorStr;
+    setStatus(BroadcastProfile::STATUS_FAILURE);
+
+    processDisconnect();
+    while (waitForRetry()) {
+        if (processConnect()) {
+            break;
+        }
+    }
+
+    if (getStatus() == BroadcastProfile::STATUS_FAILURE) {
+        QString errorText;
+        if (m_retryCount > 0) {
+            errorText = tr("Lost connection to streaming server and %1 attempts to reconnect have failed.")
+                    .arg(m_retryCount);
+        } else {
+            errorText = tr("Lost connection to streaming server.");
+        }
+        errorDialog(errorText,
+                    originalErrorStr + "\n" +
+                    m_lastErrorStr + "\n" +
+                    tr("Please check your connection to the Internet."));
+    }
+}
+
+void ShoutConnection::outputAvailable() {
     m_readSema.release();
 }
 
-// Is called from the Mixxx engine thread
-void EngineBroadcast::setOutputFifo(FIFO<CSAMPLE>* pOutputFifo) {
+void ShoutConnection::setOutputFifo(QSharedPointer<FIFO<CSAMPLE>> pOutputFifo) {
     m_pOutputFifo = pOutputFifo;
 }
 
-void EngineBroadcast::run() {
-    unsigned static id = 0;
-    QThread::currentThread()->setObjectName(QString("EngineBroadcast %1").arg(++id));
-    qDebug() << "EngineBroadcast::run: starting thread";
-    NetworkStreamWorker::debugState();
+QSharedPointer<FIFO<CSAMPLE>> ShoutConnection::getOutputFifo() {
+    return m_pOutputFifo;
+}
+
+bool ShoutConnection::threadWaiting() {
+    return m_threadWaiting;
+}
+
+void ShoutConnection::run() {
+    QThread::currentThread()->setObjectName(
+            QString("ShoutOutput '%1'").arg(m_pProfile->getProfileName()));
+    kLogger.debug() << "run: Starting thread";
+
 #ifndef __WINDOWS__
     ignoreSigpipe();
 #endif
 
     VERIFY_OR_DEBUG_ASSERT(m_pOutputFifo) {
-        qDebug() << "EngineBroadcast::run: Broadcast FIFO handle is not available. Aborting";
+        kLogger.warning() << "run: Broadcast FIFO handle is not available. Aborting";
         return;
     }
 
-    setState(NETWORKSTREAMWORKER_STATE_BUSY);
     if (!processConnect()) {
-        m_pBroadcastEnabled->set(0);
         errorDialog(tr("Can't connect to streaming server"),
-                    m_lastErrorStr + "\n" +
-                    tr("Please check your connection to the Internet and verify that your username and password are correct."));
+                m_lastErrorStr + "\n" +
+                tr("Please check your connection to the Internet and verify that your username and password are correct."));
         return;
     }
 
-    // Signal user also that we are connected
-    infoDialog(tr("Mixxx has successfully connected to the streaming server"), "");
+    setStatus(BroadcastProfile::STATUS_CONNECTED);
 
     while(true) {
-        setFunctionCode(1);
-        incRunCount();
-        m_readSema.acquire();
-        // Check to see if Broadcast is enabled, and pass the samples off to be
-        // broadcast if necessary.
-        if (!m_pBroadcastEnabled->toBool()) {
+        // Stop the thread if broadcasting is turned off
+        if (!m_pProfile->getEnabled()
+                || !m_pBroadcastEnabled->toBool()
+                || getStatus() == BroadcastProfile::STATUS_FAILURE
+                || getStatus() == BroadcastProfile::STATUS_UNCONNECTED) {
             m_threadWaiting = false;
-            if (processDisconnect()) {
-                m_pStatusCO->forceSet(STATUSCO_UNCONNECTED);
-                infoDialog(tr("Mixxx has successfully disconnected from the streaming server"), "");
+            kLogger.debug() << "run: Connection disabled or failed. Disconnecting";
+            if(processDisconnect()) {
+                setStatus(BroadcastProfile::STATUS_UNCONNECTED);
             }
             setFunctionCode(2);
-            return;
+            break;
+        }
+
+        setFunctionCode(1);
+        incRunCount();
+        if(!m_readSema.tryAcquire(1, 1000)) {
+            continue;
         }
+
         int readAvailable = m_pOutputFifo->readAvailable();
         if (readAvailable) {
             setFunctionCode(3);
@@ -869,24 +953,26 @@ void EngineBroadcast::run() {
             ring_buffer_size_t size1;
             CSAMPLE* dataPtr2;
             ring_buffer_size_t size2;
+
             // We use size1 and size2, so we can ignore the return value
             (void)m_pOutputFifo->aquireReadRegions(readAvailable, &dataPtr1, &size1,
                     &dataPtr2, &size2);
+
+            // Push frames to the encoder.
             process(dataPtr1, size1);
             if (size2 > 0) {
                 process(dataPtr2, size2);
             }
+
             m_pOutputFifo->releaseReadRegions(readAvailable);
         }
     }
-}
 
-bool EngineBroadcast::threadWaiting() {
-    return m_threadWaiting;
+    kLogger.debug() << "run: Thread stopped";
 }
 
 #ifndef __WINDOWS__
-void EngineBroadcast::ignoreSigpipe() {
+void ShoutConnection::ignoreSigpipe() {
     // If the remote connection is closed, shout_send_raw() can cause a
     // SIGPIPE. If it is unhandled then Mixxx will quit immediately.
 #ifdef Q_OS_MAC
@@ -896,7 +982,7 @@ void EngineBroadcast::ignoreSigpipe() {
     memset(&sa, 0, sizeof(sa));
     sa.sa_handler = SIG_IGN;
     if (sigaction(SIGPIPE, &sa, NULL) != 0) {
-        qDebug() << "EngineBroadcast::ignoreSigpipe() failed";
+        kLogger.warning() << "ignoreSigpipe() failed";
     }
 #else
     // http://www.microhowto.info/howto/ignore_sigpipe_without_affecting_other_threads_in_a_process.html
@@ -905,80 +991,9 @@ void EngineBroadcast::ignoreSigpipe() {
     sigaddset(&sigpipe_mask, SIGPIPE);
     sigset_t saved_mask;
     if (pthread_sigmask(SIG_BLOCK, &sigpipe_mask, &saved_mask) != 0) {
-        qDebug() << "EngineBroadcast::ignoreSigpipe() failed";
+        kLogger.warning() << "ignoreSigpipe() failed";
     }
 #endif
 }
 #endif
 
-
-void EngineBroadcast::slotEnableCO(double v) {
-    if (v > 1.0) {
-        // Wrap around manually .
-        // Wrapping around in WPushbutton does not work
-        // since the status button has 4 states, but this CO is bool
-        m_pBroadcastEnabled->set(0.0);
-        v = 0.0;
-    }
-    if (v > 0.0) {
-        serverConnect();
-    } else {
-        // return early from Timeouts
-        m_waitEnabled.wakeAll();
-    }
-}
-
-bool EngineBroadcast::waitForRetry() {
-    if (m_limitReconnects &&
-            m_retryCount >= m_maximumRetries) {
-        return false;
-    }
-    ++m_retryCount;
-
-    qDebug() << "waitForRetry()" << m_retryCount << "/" << m_maximumRetries;
-
-    double delay;
-    if (m_retryCount == 1) {
-        delay = m_reconnectFirstDelay;
-    } else {
-        delay = m_reconnectPeriod;
-    }
-
-    if (delay > 0) {
-        m_enabledMutex.lock();
-        m_waitEnabled.wait(&m_enabledMutex, delay * 1000);
-        m_enabledMutex.unlock();
-        if (!m_pBroadcastEnabled->toBool()) {
-            return false;
-        }
-    }
-    return true;
-}
-
-void EngineBroadcast::tryReconnect() {
-    QString originalErrorStr = m_lastErrorStr;
-    m_pStatusCO->forceSet(STATUSCO_FAILURE);
-
-    processDisconnect();
-    while (waitForRetry()) {
-        if (processConnect()) {
-            break;
-        }
-    }
-
-    if (m_pStatusCO->get() == STATUSCO_FAILURE) {
-        m_pBroadcastEnabled->set(0);
-        m_readSema.release();
-        QString errorText;
-        if (m_retryCount > 0) {
-            errorText = tr("Lost connection to streaming server and %1 attempts to reconnect have failed.")
-                    .arg(m_retryCount);
-        } else {
-            errorText = tr("Lost connection to streaming server.");
-        }
-        errorDialog(errorText,
-                    originalErrorStr + "\n" +
-                    m_lastErrorStr + "\n" +
-                    tr("Please check your connection to the Internet."));
-    }
-}
diff --git a/src/engine/sidechain/enginebroadcast.h b/src/engine/sidechain/shoutconnection.h
similarity index 75%
rename from src/engine/sidechain/enginebroadcast.h
rename to src/engine/sidechain/shoutconnection.h
index c7b2b2169e9..225fdef9b8e 100644
--- a/src/engine/sidechain/enginebroadcast.h
+++ b/src/engine/sidechain/shoutconnection.h
@@ -1,6 +1,10 @@
-#ifndef ENGINE_SIDECHAIN_ENGINEBROADCAST_H
-#define ENGINE_SIDECHAIN_ENGINEBROADCAST_H
+// shoutconnection.h
+// Created July 4th 2017 by Stéphane Lepin <stephane.lepin@gmail.com>
 
+#ifndef ENGINE_SIDECHAIN_SHOUTCONNECTION_H
+#define ENGINE_SIDECHAIN_SHOUTCONNECTION_H
+
+#include <engine/sidechain/networkoutputstreamworker.h>
 #include <QMessageBox>
 #include <QMutex>
 #include <QWaitCondition>
@@ -9,19 +13,17 @@
 #include <QTextCodec>
 #include <QThread>
 #include <QVector>
+#include <QSharedPointer>
 
 #include "control/controlobject.h"
 #include "control/controlproxy.h"
 #include "encoder/encodercallback.h"
 #include "encoder/encoder.h"
-#include "engine/sidechain/networkstreamworker.h"
 #include "errordialoghandler.h"
 #include "preferences/usersettings.h"
 #include "track/track.h"
 #include "util/fifo.h"
-#include "preferences/broadcastsettings.h"
-
-class ControlPushButton;
+#include "preferences/broadcastprofile.h"
 
 // Forward declare libshout structures to prevent leaking shout.h definitions
 // beyond where they are needed.
@@ -30,19 +32,12 @@ typedef struct shout shout_t;
 struct _util_dict;
 typedef struct _util_dict shout_metadata_t;
 
-class EngineBroadcast
-        : public QThread, public EncoderCallback, public NetworkStreamWorker {
+class ShoutConnection
+        : public QThread, public EncoderCallback, public NetworkOutputStreamWorker {
     Q_OBJECT
   public:
-    enum StatusCOStates {
-        STATUSCO_UNCONNECTED = 0, // IDLE state, no error
-        STATUSCO_CONNECTING = 1, // 30 s max
-        STATUSCO_CONNECTED = 2, // On Air
-        STATUSCO_FAILURE = 3 // Happens when disconnected by an error
-    };
-
-    EngineBroadcast(UserSettingsPointer pConfig);
-    virtual ~EngineBroadcast();
+    ShoutConnection(BroadcastProfilePtr profile, UserSettingsPointer pConfig);
+    virtual ~ShoutConnection();
 
     // This is called by the Engine implementation for each sample. Encode and
     // send the stream, as well as check for metadata changes.
@@ -53,7 +48,7 @@ class EngineBroadcast
 
     // Called by the encoder in method 'encodebuffer()' to flush the stream to
     // the server.
-    void write(const unsigned char *header, const unsigned char *body,
+    void write(const unsigned char* header, const unsigned char* body,
                int headerLen, int bodyLen) override;
     // gets stream position
     int tell() override;
@@ -64,18 +59,25 @@ class EngineBroadcast
 
     /** connects to server **/
     bool serverConnect();
-    bool serverDisconnect();
     bool isConnected();
+    void applySettings();
 
     virtual void outputAvailable();
-    virtual void setOutputFifo(FIFO<CSAMPLE>* pOutputFifo);
-
+    virtual void setOutputFifo(QSharedPointer<FIFO<CSAMPLE>> pOutputFifo);
+    QSharedPointer<FIFO<CSAMPLE>> getOutputFifo();
     virtual bool threadWaiting();
-
     virtual void run();
 
-  private slots:
-    void slotEnableCO(double v);
+    BroadcastProfilePtr profile() {
+        return m_pProfile;
+    }
+
+    void setStatus(int newState) {
+        return m_pProfile->setConnectionStatus(newState);
+    }
+    int getStatus() {
+        return m_pProfile->connectionStatus();
+    }
 
   signals:
     void broadcastDisconnected();
@@ -85,7 +87,7 @@ class EngineBroadcast
     bool processConnect();
     bool processDisconnect();
 
-    // Update the libshout struct with info from Mixxx's broadcast preferences.
+    // Update the libshout struct with info from the current broadcast profile.
     void updateFromPreferences();
     int getActiveTracks();
     // Check if the metadata has changed since the previous check.  We also
@@ -115,7 +117,6 @@ class EngineBroadcast
 
     void tryReconnect();
 
-
     QTextCodec* m_pTextCodec;
     TrackPointer m_pMetaData;
     shout_t *m_pShout;
@@ -123,12 +124,11 @@ class EngineBroadcast
     int m_iMetaDataLife;
     long m_iShoutStatus;
     long m_iShoutFailures;
-    BroadcastSettings m_settings;
     UserSettingsPointer m_pConfig;
+    BroadcastProfilePtr m_pProfile;
     EncoderPointer m_encoder;
-    ControlPushButton* m_pBroadcastEnabled;
     ControlProxy* m_pMasterSamplerate;
-    ControlObject* m_pStatusCO;
+    ControlProxy* m_pBroadcastEnabled;
     // static metadata according to prefereneces
     bool m_custom_metadata;
     QString m_customArtist;
@@ -147,7 +147,7 @@ class EngineBroadcast
     bool m_ogg_dynamic_update;
     QAtomicInt m_threadWaiting;
     QSemaphore m_readSema;
-    FIFO<CSAMPLE>* m_pOutputFifo;
+    QSharedPointer<FIFO<CSAMPLE>> m_pOutputFifo;
 
     QString m_lastErrorStr;
     int m_retryCount;
@@ -162,4 +162,7 @@ class EngineBroadcast
     QWaitCondition m_waitEnabled;
 };
 
-#endif // ENGINE_SIDECHAIN_ENGINEBROADCAST_H
+typedef QSharedPointer<ShoutConnection> ShoutConnectionPtr;
+
+#endif // ENGINE_SIDECHAIN_SHOUTCONNECTION_H
+
diff --git a/src/mixxx.cpp b/src/mixxx.cpp
index 5c9d4a55aed..1e3d1d8b94b 100644
--- a/src/mixxx.cpp
+++ b/src/mixxx.cpp
@@ -210,7 +210,8 @@ void MixxxMainWindow::initialize(QApplication* pApp, const CmdlineArgs& args) {
 
 
 #ifdef __BROADCAST__
-    m_pBroadcastManager = new BroadcastManager(pConfig, m_pSoundManager);
+    m_pBroadcastManager = new BroadcastManager(m_pSettingsManager,
+                                               m_pSoundManager);
 #endif
 
     launchProgress(11);
@@ -344,7 +345,7 @@ void MixxxMainWindow::initialize(QApplication* pApp, const CmdlineArgs& args) {
     // Initialize preference dialog
     m_pPrefDlg = new DlgPreferences(this, m_pSkinLoader, m_pSoundManager, m_pPlayerManager,
                                     m_pControllerManager, m_pVCManager, m_pEffectsManager,
-                                    pConfig, m_pLibrary);
+                                    m_pSettingsManager, m_pLibrary);
     m_pPrefDlg->setWindowIcon(QIcon(":/images/ic_mixxx_window.png"));
     m_pPrefDlg->setHidden(true);
 
@@ -647,7 +648,6 @@ void MixxxMainWindow::finalize() {
     Sandbox::shutdown();
 
     qDebug() << t.elapsed(false).debugMillisWithUnit() << "deleting SettingsManager";
-    delete m_pSettingsManager;
 
     delete m_pKeyboard;
     delete m_pKbdConfig;
diff --git a/src/mixxx.h b/src/mixxx.h
index 69ae82f83cb..45fa588c3c1 100644
--- a/src/mixxx.h
+++ b/src/mixxx.h
@@ -19,6 +19,7 @@
 #define MIXXX_H
 
 #include <QMainWindow>
+#include <QSharedPointer>
 #include <QString>
 
 #include "preferences/configobject.h"
@@ -49,6 +50,8 @@ class SoundManager;
 class VinylControlManager;
 class WMainMenuBar;
 
+typedef QSharedPointer<SettingsManager> SettingsManagerPointer;
+
 // This Class is the base class for Mixxx. It sets up the main
 // window and providing a menubar.
 // For the main view, an instance of class MixxxView is
diff --git a/src/preferences/broadcastprofile.cpp b/src/preferences/broadcastprofile.cpp
new file mode 100644
index 00000000000..4ff2b35b3d0
--- /dev/null
+++ b/src/preferences/broadcastprofile.cpp
@@ -0,0 +1,705 @@
+// broadcastprofile.cpp
+// Created June 2nd 2017 by Stéphane Lepin <stephane.lepin@gmail.com>
+
+#include <QEventLoop>
+#include <QFile>
+#include <QFileInfo>
+#include <QTextStream>
+#include <QRegExp>
+#include <QString>
+#include <QStringList>
+
+#ifdef __QTKEYCHAIN__
+#include <qtkeychain/keychain.h>
+using namespace QKeychain;
+#endif
+
+#include "broadcast/defs_broadcast.h"
+#include "defs_urls.h"
+#include "util/xml.h"
+#include "util/memory.h"
+#include "util/logger.h"
+
+#include "broadcastprofile.h"
+
+namespace {
+const char* kDoctype = "broadcastprofile";
+const char* kDocumentRoot = "BroadcastProfile";
+const char* kSecureCredentials = "SecureCredentialsStorage";
+const char* kBitrate = "Bitrate";
+const char* kChannels = "Channels";
+const char* kCustomArtist = "CustomArtist";
+const char* kCustomTitle = "CustomTitle";
+const char* kEnableMetadata = "EnableMetadata";
+const char* kEnableReconnect = "EnableReconnect";
+const char* kEnabled = "Enabled";
+const char* kFormat = "Format";
+const char* kHost = "Host";
+const char* kLimitReconnects = "LimitReconnects";
+const char* kLogin = "Login";
+const char* kMaximumRetries = "MaximumRetries";
+const char* kMetadataCharset = "MetadataCharset";
+const char* kMetadataFormat = "MetadataFormat";
+const char* kMountPoint = "Mountpoint";
+const char* kNoDelayFirstReconnect = "NoDelayFirstReconnect";
+const char* kOggDynamicUpdate = "OggDynamicUpdate";
+const char* kPassword = "Password";
+const char* kPort = "Port";
+const char* kReconnectFirstDelay = "ReconnectFirstDelay";
+const char* kReconnectPeriod = "ReconnectPeriod";
+const char* kServertype = "Servertype";
+const char* kStreamDesc = "StreamDesc";
+const char* kStreamGenre = "StreamGenre";
+const char* kStreamName = "StreamName";
+const char* kStreamPublic = "StreamPublic";
+const char* kStreamWebsite = "StreamWebsite";
+
+const char* kKeychainPrefix = "Mixxx - ";
+
+const double kDefaultBitrate = 128;
+const int kDefaultChannels = 2;
+const bool kDefaultEnableMetadata = false;
+const bool kDefaultEnableReconnect = true;
+const bool kDefaultLimitReconnects = true;
+const int kDefaultMaximumRetries = 10;
+// No tr() here, see https://bugs.launchpad.net/mixxx/+bug/1419500
+const QString kDefaultMetadataFormat("$artist - $title");
+const bool kDefaultNoDelayFirstReconnect = true;
+const bool kDefaultOggDynamicupdate = false;
+double kDefaultReconnectFirstDelay = 0.0;
+double kDefaultReconnectPeriod = 5.0;
+const QString kDefaultStreamDesc =
+        QObject::tr("This stream is online for testing purposes!");
+const QString kDefaultStreamGenre = QObject::tr("Live Mix");
+const bool kDefaultStreamPublic = false;
+
+const QRegExp kForbiddenChars =
+        QRegExp("[<>:\"\\/|?*\\\\]|(\\.\\.)"
+                "|CON|AUX|PRN|COM(\\d+)|LPT(\\d+)|NUL");
+
+const mixxx::Logger kLogger("BroadcastProfile");
+} // anonymous namespace
+
+BroadcastProfile::BroadcastProfile(const QString& profileName,
+                                   QObject* parent)
+    : QObject(parent) {
+    adoptDefaultValues();
+
+    // Direct assignment to avoid triggering the
+    // profileNameChanged signal
+    m_profileName = QString(profileName);
+}
+
+bool BroadcastProfile::validName(const QString& str) {
+    return !str.contains(kForbiddenChars);
+}
+
+QString BroadcastProfile::stripForbiddenChars(const QString& str) {
+    QString sourceText(str);
+    return sourceText.replace(kForbiddenChars, " ");
+}
+
+BroadcastProfilePtr BroadcastProfile::loadFromFile(
+        const QString& filename) {
+    QFileInfo xmlFile(filename);
+    if(!xmlFile.exists())
+        return BroadcastProfilePtr(nullptr);
+
+    QString profileFilename = xmlFile.baseName();
+    // The profile filename (without extension) is used to create the instance
+    // but the real profile name (with forbidden chars but suitable for
+    // non-filesystem uses) will be fetched from the XML file and set in the
+    // object during the call to loadValues()
+    BroadcastProfilePtr profile(new BroadcastProfile(profileFilename));
+    profile->loadValues(filename);
+    return profile;
+}
+
+bool BroadcastProfile::equals(BroadcastProfilePtr other) {
+    return ((getProfileName() == other->getProfileName())
+            && valuesEquals(other));
+}
+
+bool BroadcastProfile::valuesEquals(BroadcastProfilePtr other) {
+    if(getEnabled() == other->getEnabled()
+            && secureCredentialStorage() == other->secureCredentialStorage()
+            && getHost() == other->getHost()
+            && getPort() == other->getPort()
+            && getServertype() == other->getServertype()
+            && getLogin() == other->getLogin()
+            && getPassword() == other->getPassword()
+            && getEnableReconnect() == other->getEnableReconnect()
+            && getReconnectPeriod() == other->getReconnectPeriod()
+            && getLimitReconnects() == other->getLimitReconnects()
+            && getMaximumRetries() == other->getMaximumRetries()
+            && getNoDelayFirstReconnect() == other->getNoDelayFirstReconnect()
+            && getReconnectFirstDelay() == other->getReconnectFirstDelay()
+            && getFormat() == other->getFormat()
+            && getBitrate() == other->getBitrate()
+            && getChannels() == other->getChannels()
+            && getMountpoint() == other->getMountpoint()
+            && getStreamName() == other->getStreamName()
+            && getStreamDesc() == other->getStreamDesc()
+            && getStreamGenre() == other->getStreamGenre()
+            && getStreamPublic() == other->getStreamPublic()
+            && getStreamWebsite() == other->getStreamWebsite()
+            && getEnableMetadata() == other->getEnableMetadata()
+            && getMetadataCharset() == other->getMetadataCharset()
+            && getCustomArtist() == other->getCustomArtist()
+            && getCustomTitle() == other->getCustomTitle()
+            && getMetadataFormat() == other->getMetadataFormat()
+            && getOggDynamicUpdate() == other->getOggDynamicUpdate()) {
+        return true;
+    }
+
+    return false;
+}
+
+BroadcastProfilePtr BroadcastProfile::valuesCopy() {
+    BroadcastProfilePtr newProfile(
+            new BroadcastProfile(getProfileName()));
+    copyValuesTo(newProfile);
+    return newProfile;
+}
+
+void BroadcastProfile::copyValuesTo(BroadcastProfilePtr other) {
+    other->setSecureCredentialStorage(this->secureCredentialStorage());
+
+    other->setHost(this->getHost());
+    other->setPort(this->getPort());
+
+    other->setServertype(this->getServertype());
+    other->setLogin(this->getLogin());
+    other->setPassword(this->getPassword());
+
+    other->setEnableReconnect(this->getEnableReconnect());
+    other->setReconnectPeriod(this->getReconnectPeriod());
+
+    other->setLimitReconnects(this->getLimitReconnects());
+    other->setMaximumRetries(this->getMaximumRetries());
+
+    other->setNoDelayFirstReconnect(this->getNoDelayFirstReconnect());
+    other->setReconnectFirstDelay(this->getReconnectFirstDelay());
+
+    other->setFormat(this->getFormat());
+    other->setBitrate(this->getBitrate());
+    other->setChannels(this->getChannels());
+
+    other->setMountPoint(this->getMountpoint());
+    other->setStreamName(this->getStreamName());
+    other->setStreamDesc(this->getStreamDesc());
+    other->setStreamGenre(this->getStreamGenre());
+    other->setStreamPublic(this->getStreamPublic());
+    other->setStreamWebsite(this->getStreamWebsite());
+
+    other->setEnableMetadata(this->getEnableMetadata());
+    other->setMetadataCharset(this->getMetadataCharset());
+    other->setCustomArtist(this->getCustomArtist());
+    other->setCustomTitle(this->getCustomTitle());
+    other->setMetadataFormat(this->getMetadataFormat());
+    other->setOggDynamicUpdate(this->getOggDynamicUpdate());
+
+    other->setEnabled(this->getEnabled());
+}
+
+void BroadcastProfile::adoptDefaultValues() {
+    m_secureCredentials = false;
+    m_enabled = false;
+
+    m_host = QString();
+    m_port = BROADCAST_DEFAULT_PORT;
+    m_serverType = QString();
+    m_login = QString();
+    m_password = QString();
+
+    m_enableReconnect = kDefaultEnableReconnect;
+    m_reconnectPeriod = kDefaultReconnectPeriod;
+    m_limitReconnects = kDefaultLimitReconnects;
+
+    m_mountpoint = QString();
+    m_streamDesc = kDefaultStreamDesc;
+    m_streamGenre = kDefaultStreamGenre;
+    m_streamName = QString();
+    m_streamPublic = kDefaultStreamPublic;
+    m_streamWebsite = MIXXX_WEBSITE_URL;
+
+    m_enableMetadata = kDefaultEnableMetadata;
+    m_metadataCharset = QString();
+    m_customArtist = QString();
+    m_customTitle = QString();
+    m_metadataFormat = kDefaultMetadataFormat;
+    m_oggDynamicUpdate = kDefaultOggDynamicupdate;
+
+    m_bitrate = kDefaultBitrate;
+    m_channels = kDefaultChannels;
+    m_format = QString();
+
+    m_noDelayFirstReconnect = kDefaultNoDelayFirstReconnect;
+    m_reconnectFirstDelay = kDefaultReconnectFirstDelay;
+    m_maximumRetries = kDefaultMaximumRetries;
+}
+
+bool BroadcastProfile::loadValues(const QString& filename) {
+    QDomElement doc = XmlParse::openXMLFile(filename, kDoctype);
+    if(doc.childNodes().size() < 1)
+        return false;
+
+    m_secureCredentials = (bool)XmlParse::selectNodeInt(doc, kSecureCredentials);
+#ifndef __QTKEYCHAIN__
+    // Secure credentials storage can't be enabled nor disabled from the UI,
+    // so force it to disabled to avoid issues if enabled.
+    m_secureCredentials = false;
+#endif
+
+    m_enabled = (bool)XmlParse::selectNodeInt(doc, kEnabled);
+
+    m_host = XmlParse::selectNodeQString(doc, kHost);
+    m_port = XmlParse::selectNodeInt(doc, kPort);
+    m_serverType = XmlParse::selectNodeQString(doc, kServertype);
+
+    m_login = XmlParse::selectNodeQString(doc, kLogin);
+    if(m_secureCredentials) {
+        m_password = getSecurePassword(m_login);
+    } else {
+        m_password = XmlParse::selectNodeQString(doc, kPassword);
+    }
+
+    m_enableReconnect =
+            (bool)XmlParse::selectNodeInt(doc, kEnableReconnect);
+    m_reconnectPeriod =
+            XmlParse::selectNodeDouble(doc, kReconnectPeriod);
+
+    m_limitReconnects =
+            (bool)XmlParse::selectNodeInt(doc, kLimitReconnects);
+    m_maximumRetries =
+            XmlParse::selectNodeInt(doc, kMaximumRetries);
+
+    m_noDelayFirstReconnect =
+            (bool)XmlParse::selectNodeInt(doc, kNoDelayFirstReconnect);
+    m_reconnectFirstDelay =
+            XmlParse::selectNodeDouble(doc, kReconnectFirstDelay);
+
+    m_mountpoint = XmlParse::selectNodeQString(doc, kMountPoint);
+    m_streamName = XmlParse::selectNodeQString(doc, kStreamName);
+    m_streamDesc = XmlParse::selectNodeQString(doc, kStreamDesc);
+    m_streamGenre = XmlParse::selectNodeQString(doc, kStreamGenre);
+    m_streamPublic = (bool)XmlParse::selectNodeInt(doc, kStreamPublic);
+    m_streamWebsite = XmlParse::selectNodeQString(doc, kStreamWebsite);
+
+    m_format = XmlParse::selectNodeQString(doc, kFormat);
+    m_bitrate = XmlParse::selectNodeInt(doc, kBitrate);
+    m_channels = XmlParse::selectNodeInt(doc, kChannels);
+
+    m_enableMetadata = (bool)XmlParse::selectNodeInt(doc, kEnableMetadata);
+    m_metadataCharset = XmlParse::selectNodeQString(doc, kMetadataCharset);
+    m_customArtist = XmlParse::selectNodeQString(doc, kCustomArtist);
+    m_customTitle = XmlParse::selectNodeQString(doc, kCustomTitle);
+    m_metadataFormat = XmlParse::selectNodeQString(doc, kMetadataFormat);
+    m_oggDynamicUpdate =
+            (bool)XmlParse::selectNodeInt(doc, kMetadataFormat);
+
+    return true;
+}
+
+bool BroadcastProfile::save(const QString& filename) {
+    QDomDocument doc(kDoctype);
+    QDomElement docRoot = doc.createElement(kDocumentRoot);
+
+    XmlParse::addElement(doc, docRoot,
+                         kSecureCredentials, QString::number((int)m_secureCredentials));
+    XmlParse::addElement(doc, docRoot,
+                         kEnabled, QString::number((int)m_enabled));
+
+    XmlParse::addElement(doc, docRoot, kHost, m_host);
+    XmlParse::addElement(doc, docRoot, kPort, QString::number(m_port));
+    XmlParse::addElement(doc, docRoot, kServertype, m_serverType);
+
+    XmlParse::addElement(doc, docRoot, kLogin, m_login);
+    if(m_secureCredentials) {
+        setSecurePassword(m_login, m_password);
+    } else {
+        XmlParse::addElement(doc, docRoot, kPassword, m_password);
+    }
+
+    XmlParse::addElement(doc, docRoot, kEnableReconnect,
+                         QString::number((int)m_enableReconnect));
+    XmlParse::addElement(doc, docRoot, kReconnectPeriod,
+                         QString::number(m_reconnectPeriod));
+
+    XmlParse::addElement(doc, docRoot, kLimitReconnects,
+                         QString::number((int)m_limitReconnects));
+    XmlParse::addElement(doc, docRoot, kMaximumRetries,
+                         QString::number(m_maximumRetries));
+
+    XmlParse::addElement(doc, docRoot, kNoDelayFirstReconnect,
+                         QString::number((int)m_noDelayFirstReconnect));
+    XmlParse::addElement(doc, docRoot, kReconnectFirstDelay,
+                         QString::number(m_reconnectFirstDelay));
+
+    XmlParse::addElement(doc, docRoot, kMountPoint, m_mountpoint);
+    XmlParse::addElement(doc, docRoot, kStreamName, m_streamName);
+    XmlParse::addElement(doc, docRoot, kStreamDesc, m_streamDesc);
+    XmlParse::addElement(doc, docRoot, kStreamGenre, m_streamGenre);
+    XmlParse::addElement(doc, docRoot, kStreamPublic,
+                         QString::number((int)m_streamPublic));
+    XmlParse::addElement(doc, docRoot, kStreamWebsite, m_streamWebsite);
+
+    XmlParse::addElement(doc, docRoot, kFormat, m_format);
+    XmlParse::addElement(doc, docRoot, kBitrate,
+                         QString::number(m_bitrate));
+    XmlParse::addElement(doc, docRoot, kChannels,
+                         QString::number(m_channels));
+
+    XmlParse::addElement(doc, docRoot, kEnableMetadata,
+                         QString::number((int)m_enableMetadata));
+    XmlParse::addElement(doc, docRoot, kMetadataCharset, m_metadataCharset);
+    XmlParse::addElement(doc, docRoot, kCustomArtist, m_customArtist);
+    XmlParse::addElement(doc, docRoot, kCustomTitle, m_customTitle);
+    XmlParse::addElement(doc, docRoot, kMetadataFormat, m_metadataFormat);
+    XmlParse::addElement(doc, docRoot, kOggDynamicUpdate,
+                         QString::number((int)m_oggDynamicUpdate));
+
+    doc.appendChild(docRoot);
+
+    QFile xmlFile(filename);
+    if(xmlFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        QTextStream fileStream(&xmlFile);
+        doc.save(fileStream, 4);
+        xmlFile.close();
+
+        return true;
+    }
+    return false;
+}
+
+void BroadcastProfile::setProfileName(const QString &profileName) {
+    QString oldName(m_profileName);
+    m_profileName = QString(profileName);
+
+    emit profileNameChanged(oldName, m_profileName);
+}
+
+QString BroadcastProfile::getProfileName() const {
+    return m_profileName;
+}
+
+void BroadcastProfile::setConnectionStatus(int newState) {
+    m_connectionStatus = newState;
+    emit connectionStatusChanged(m_connectionStatus);
+}
+
+int BroadcastProfile::connectionStatus() {
+    return m_connectionStatus;
+}
+
+void BroadcastProfile::setSecureCredentialStorage(bool value) {
+    m_secureCredentials = value;
+}
+
+bool BroadcastProfile::secureCredentialStorage() {
+    return m_secureCredentials;
+}
+
+bool BroadcastProfile::setSecurePassword(QString login, QString password) {
+#ifdef __QTKEYCHAIN__
+    QString serviceName = QString(kKeychainPrefix) + getProfileName();
+
+    WritePasswordJob writeJob(serviceName);
+    writeJob.setAutoDelete(false);
+    writeJob.setKey(login);
+    writeJob.setTextData(password);
+
+    QEventLoop loop;
+    writeJob.connect(&writeJob, SIGNAL(finished(QKeychain::Job*)),
+                     &loop, SLOT(quit()));
+    writeJob.start();
+    loop.exec();
+
+    if(writeJob.error() == Error::NoError) {
+        kLogger.debug() << "setSecureValue: write successful";
+        return true;
+    } else {
+        kLogger.warning() << "setSecureValue: write job failed with error:"
+                << writeJob.errorString();
+        errorDialog(tr("Can't use secure password storage: keychain access failed."),
+                writeJob.errorString());
+        return false;
+    }
+#endif
+    return false;
+}
+
+QString BroadcastProfile::getSecurePassword(QString login) {
+#ifdef __QTKEYCHAIN__
+    QString serviceName = QString(kKeychainPrefix) + getProfileName();
+
+    ReadPasswordJob readJob(serviceName);
+    readJob.setAutoDelete(false);
+    readJob.setKey(login);
+
+    QEventLoop loop;
+    readJob.connect(&readJob, SIGNAL(finished(QKeychain::Job*)),
+                    &loop, SLOT(quit()));
+    readJob.start();
+    loop.exec();
+
+    if(readJob.error() == Error::NoError) {
+        kLogger.debug() << "getSecureValue: read successful";
+        return readJob.textData();
+    } else {
+        kLogger.warning() << "getSecureValue: read job failed with error:"
+                        << readJob.errorString();
+        errorDialog(tr("Secure password retrieval unsuccessful: keychain access failed."),
+                        readJob.errorString());
+    }
+#endif
+    return QString();
+}
+
+void BroadcastProfile::errorDialog(QString text, QString detailedError) {
+    ErrorDialogProperties* props = ErrorDialogHandler::instance()->newDialogProperties();
+    props->setType(DLG_WARNING);
+    props->setTitle(tr("Settings error"));
+    props->setText(tr("<b>Error with settings for '%1':</b><br>")
+            .arg(getProfileName()) + text);
+    props->setDetails(detailedError);
+    props->setKey(detailedError);   // To prevent multiple windows for the same error
+    props->setDefaultButton(QMessageBox::Close);
+    props->setModal(false);
+    ErrorDialogHandler::instance()->requestErrorDialog(props);
+}
+
+void BroadcastProfile::relayStatus(bool newStatus) {
+    setEnabled(newStatus);
+}
+
+// Used by BroadcastSettings to relay connection status
+// to copies in BroadcastSettingsModel
+void BroadcastProfile::relayConnectionStatus(int newConnectionStatus) {
+    setConnectionStatus(newConnectionStatus);
+}
+
+// This was useless before, but now comes in handy for multi-broadcasting,
+// where it means "this connection is enabled and will be started by Mixxx"
+bool BroadcastProfile::getEnabled() const {
+    return m_enabled;
+}
+
+void BroadcastProfile::setEnabled(bool value) {
+    m_enabled = value;
+    emit statusChanged(m_enabled);
+}
+
+QString BroadcastProfile::getHost() const {
+    return m_host;
+}
+
+void BroadcastProfile::setHost(const QString& value) {
+    m_host = QString(value);
+}
+
+int BroadcastProfile::getPort() const {
+    // Valid port numbers are 0 .. 65535 (16 bit unsigned)
+    if (m_port < 0 || m_port > 0xFFFF) {
+        return BROADCAST_DEFAULT_PORT;
+    }
+
+    return m_port;
+}
+
+void BroadcastProfile::setPort(int value) {
+    m_port = value;
+}
+
+QString BroadcastProfile::getServertype() const {
+    return m_serverType;
+}
+
+void BroadcastProfile::setServertype(const QString& value) {
+    m_serverType = QString(value);
+}
+
+QString BroadcastProfile::getLogin() const {
+    return m_login;
+}
+
+void BroadcastProfile::setLogin(const QString& value) {
+    m_login = QString(value);
+}
+
+// TODO(Palakis, June 2nd 2017): implement secure password storage
+QString BroadcastProfile::getPassword() const {
+    return m_password;
+}
+
+void BroadcastProfile::setPassword(const QString& value) {
+    m_password = QString(value);
+}
+
+bool BroadcastProfile::getEnableReconnect() const {
+    return m_enableReconnect;
+}
+
+void BroadcastProfile::setEnableReconnect(bool value) {
+    m_enableReconnect = value;
+}
+
+double BroadcastProfile::getReconnectPeriod() const {
+    return m_reconnectPeriod;
+}
+
+void BroadcastProfile::setReconnectPeriod(double value) {
+    m_reconnectPeriod = value;
+}
+
+bool BroadcastProfile::getLimitReconnects() const {
+    return m_limitReconnects;
+}
+
+void BroadcastProfile::setLimitReconnects(bool value) {
+    m_limitReconnects = value;
+}
+
+int BroadcastProfile::getMaximumRetries() const {
+    return m_maximumRetries;
+}
+
+void BroadcastProfile::setMaximumRetries(int value) {
+    m_maximumRetries = value;
+}
+
+bool BroadcastProfile::getNoDelayFirstReconnect() const {
+    return m_noDelayFirstReconnect;
+}
+
+void BroadcastProfile::setNoDelayFirstReconnect(bool value) {
+    m_noDelayFirstReconnect = value;
+}
+
+double BroadcastProfile::getReconnectFirstDelay() const {
+    return m_reconnectFirstDelay;
+}
+
+void BroadcastProfile::setReconnectFirstDelay(double value) {
+    m_reconnectFirstDelay = value;
+}
+
+QString BroadcastProfile::getMountpoint() const {
+    return m_mountpoint;
+}
+
+void BroadcastProfile::setMountPoint(const QString& value) {
+    m_mountpoint = QString(value);
+}
+
+QString BroadcastProfile::getStreamName() const {
+    return m_streamName;
+}
+
+void BroadcastProfile::setStreamName(const QString& value) {
+    m_streamName = QString(value);
+}
+
+QString BroadcastProfile::getStreamDesc() const {
+    return m_streamDesc;
+}
+
+void BroadcastProfile::setStreamDesc(const QString& value) {
+    m_streamDesc = QString(value);
+}
+
+QString BroadcastProfile::getStreamGenre() const {
+    return m_streamGenre;
+}
+
+void BroadcastProfile::setStreamGenre(const QString& value) {
+    m_streamGenre = QString(value);
+}
+
+bool BroadcastProfile::getStreamPublic() const {
+    return m_streamPublic;
+}
+
+void BroadcastProfile::setStreamPublic(bool value) {
+    m_streamPublic = value;
+}
+
+QString BroadcastProfile::getStreamWebsite() const {
+    return m_streamWebsite;
+}
+
+void BroadcastProfile::setStreamWebsite(const QString& value) {
+    m_streamWebsite = QString(value);
+}
+
+QString BroadcastProfile::getFormat() const {
+    return m_format;
+}
+
+void BroadcastProfile::setFormat(const QString& value) {
+    m_format = QString(value);
+}
+
+int BroadcastProfile::getBitrate() const {
+    return m_bitrate;
+}
+
+void BroadcastProfile::setBitrate(int value) {
+    m_bitrate = value;
+}
+
+int BroadcastProfile::getChannels() const {
+    return m_channels;
+}
+
+void BroadcastProfile::setChannels(int value) {
+    m_channels = value;
+}
+
+bool BroadcastProfile::getEnableMetadata() const {
+    return m_enableMetadata;
+}
+
+void BroadcastProfile::setEnableMetadata(bool value) {
+    m_enableMetadata = value;
+}
+
+QString BroadcastProfile::getMetadataCharset() const {
+    return m_metadataCharset;
+}
+
+void BroadcastProfile::setMetadataCharset(const QString& value) {
+    m_metadataCharset = QString(value);
+}
+
+QString BroadcastProfile::getCustomArtist() const {
+    return m_customArtist;
+}
+
+void BroadcastProfile::setCustomArtist(const QString& value) {
+    m_customArtist = QString(value);
+}
+
+QString BroadcastProfile::getCustomTitle() const {
+    return m_customTitle;
+}
+
+void BroadcastProfile::setCustomTitle(const QString& value) {
+    m_customTitle = QString(value);
+}
+
+QString BroadcastProfile::getMetadataFormat() const {
+    return m_metadataFormat;
+}
+
+void BroadcastProfile::setMetadataFormat(const QString& value) {
+    m_metadataFormat = QString(value);
+}
+
+bool BroadcastProfile::getOggDynamicUpdate() const {
+    return m_oggDynamicUpdate;
+}
+
+void BroadcastProfile::setOggDynamicUpdate(bool value) {
+    m_oggDynamicUpdate = value;
+}
diff --git a/src/preferences/broadcastprofile.h b/src/preferences/broadcastprofile.h
new file mode 100644
index 00000000000..b2aad04c4fc
--- /dev/null
+++ b/src/preferences/broadcastprofile.h
@@ -0,0 +1,187 @@
+// broadcastprofile.h
+// Created June 2nd 2017 by Stéphane Lepin <stephane.lepin@gmail.com>
+
+#ifndef BROADCASTPROFILE_H
+#define BROADCASTPROFILE_H
+
+#include <QSharedPointer>
+#include <QObject>
+#include <QString>
+
+#include "preferences/usersettings.h"
+
+class BroadcastProfile;
+typedef QSharedPointer<BroadcastProfile> BroadcastProfilePtr;
+Q_DECLARE_METATYPE(BroadcastProfilePtr)
+
+class BroadcastProfile : public QObject {
+  Q_OBJECT
+
+  public:
+    enum StatusStates {
+          STATUS_UNCONNECTED = 0, // IDLE state, no error
+          STATUS_CONNECTING = 1, // 30 s max
+          STATUS_CONNECTED = 2, // On Air
+          STATUS_FAILURE = 3 // Happens when disconnected by an error
+    };
+
+    explicit BroadcastProfile(const QString& profileName,
+                              QObject* parent = nullptr);
+    bool save(const QString& filename);
+    bool equals(BroadcastProfilePtr other);
+    bool valuesEquals(BroadcastProfilePtr other);
+    BroadcastProfilePtr valuesCopy();
+    void copyValuesTo(BroadcastProfilePtr other);
+
+    static BroadcastProfilePtr loadFromFile(const QString& filename);
+    static bool validName(const QString& str);
+    static QString stripForbiddenChars(const QString& str);
+
+    void setConnectionStatus(int newState);
+    int connectionStatus();
+
+    void setSecureCredentialStorage(bool enabled);
+    bool secureCredentialStorage();
+
+    void setProfileName(const QString& profileName);
+    QString getProfileName() const;
+
+    bool getEnabled() const;
+    void setEnabled(bool value);
+
+    QString getHost() const;
+    void setHost(const QString& value);
+
+    int getPort() const;
+    void setPort(int value);
+
+    QString getServertype() const;
+    void setServertype(const QString& value);
+
+    QString getLogin() const;
+    void setLogin(const QString& value);
+
+    QString getPassword() const;
+    void setPassword(const QString& value);
+
+    bool getEnableReconnect() const;
+    void setEnableReconnect(bool value);
+
+    double getReconnectPeriod() const;
+    void setReconnectPeriod(double value);
+
+    bool getLimitReconnects() const;
+    void setLimitReconnects(bool value);
+
+    int getMaximumRetries() const;
+    void setMaximumRetries(int value);
+
+    bool getNoDelayFirstReconnect() const;
+    void setNoDelayFirstReconnect(bool value);
+
+    double getReconnectFirstDelay() const;
+    void setReconnectFirstDelay(double value);
+
+    QString getFormat() const;
+    void setFormat(const QString& value);
+
+    int getBitrate() const;
+    void setBitrate(int value);
+
+    int getChannels() const;
+    void setChannels(int value);
+
+    QString getMountpoint() const;
+    void setMountPoint(const QString& value);
+
+    QString getStreamName() const;
+    void setStreamName(const QString& value);
+
+    QString getStreamDesc() const;
+    void setStreamDesc(const QString& value);
+
+    QString getStreamGenre() const;
+    void setStreamGenre(const QString& value);
+
+    bool getStreamPublic() const;
+    void setStreamPublic(bool value);
+
+    QString getStreamWebsite() const;
+    void setStreamWebsite(const QString& value);
+
+    bool getEnableMetadata() const;
+    void setEnableMetadata(bool value);
+
+    QString getMetadataCharset() const;
+    void setMetadataCharset(const QString& value);
+
+    QString getCustomArtist() const;
+    void setCustomArtist(const QString& value);
+
+    QString getCustomTitle() const;
+    void setCustomTitle(const QString& value);
+
+    QString getMetadataFormat() const;
+    void setMetadataFormat(const QString& value);
+
+    bool getOggDynamicUpdate() const;
+    void setOggDynamicUpdate(bool value);
+
+  signals:
+    void profileNameChanged(QString oldName, QString newName);
+    void statusChanged(bool newStatus);
+    void connectionStatusChanged(int newConnectionStatus);
+
+  public slots:
+    void relayStatus(bool newStatus);
+    void relayConnectionStatus(int newConnectionStatus);
+
+  private:
+    void adoptDefaultValues();
+    bool loadValues(const QString& filename);
+
+    bool setSecurePassword(QString login, QString password);
+    QString getSecurePassword(QString login);
+
+    void errorDialog(QString text, QString detailedError);
+
+    bool m_secureCredentials;
+
+    QString m_profileName;
+    bool m_enabled;
+
+    QString m_host;
+    int m_port;
+    QString m_serverType;
+    QString m_login;
+    QString m_password;
+
+    bool m_enableReconnect;
+    double m_reconnectPeriod;
+    bool m_limitReconnects;
+    int m_maximumRetries;
+    bool m_noDelayFirstReconnect;
+    double m_reconnectFirstDelay;
+
+    QString m_mountpoint;
+    QString m_streamName;
+    QString m_streamDesc;
+    QString m_streamGenre;
+    bool m_streamPublic;
+    QString m_streamWebsite;
+
+    QString m_format;
+    int m_bitrate;
+    int m_channels;
+
+    bool m_enableMetadata;
+    QString m_metadataCharset;
+    QString m_customArtist;
+    QString m_customTitle;
+    QString m_metadataFormat;
+    bool m_oggDynamicUpdate;
+
+    QAtomicInt m_connectionStatus;
+};
+
+#endif // BROADCASTPROFILE_H
diff --git a/src/preferences/broadcastsettings.cpp b/src/preferences/broadcastsettings.cpp
index 8f2185596d3..5a223542c81 100644
--- a/src/preferences/broadcastsettings.cpp
+++ b/src/preferences/broadcastsettings.cpp
@@ -1,417 +1,235 @@
-#include "preferences/broadcastsettings.h"
+#include <QDir>
+#include <QStringList>
+#include <QFileInfoList>
+#include <QFileInfo>
+
 #include "broadcast/defs_broadcast.h"
 #include "defs_urls.h"
+#include "preferences/broadcastsettings.h"
+#include "util/logger.h"
+#include "util/memory.h"
 
 namespace {
-const char* kConfigKey = "[Shoutcast]";
-
-const char* kBitrate = "bitrate";
-const char* kChannels = "channels";
-const char* kCustomArtist = "custom_artist";
-const char* kCustomTitle = "custom_title";
-const char* kEnableMetadata = "enable_metadata";
-const char* kEnableReconnect = "enable_reconnect";
-const char* kEnabled = "enabled";
-const char* kFormat = "format";
-const char* kHost = "host";
-const char* kLimitReconnects = "limit_reconnects";
-const char* kLogin = "login";
-const char* kMaximumRetries = "maximum_retries";
-const char* kMetadataCharset = "metadata_charset";
-const char* kMetadataFormat = "metadata_format";
-const char* kMountPoint = "mountpoint";
-const char* kNoDelayFirstReconnect = "no_delay_first_reconnect";
-const char* kOggDynamicUpdate = "ogg_dynamicupdate";
-const char* kPassword = "password";
-const char* kPort = "port";
-const char* kReconnectFirstDelay = "reconnect_first_delay";
-const char* kReconnectPeriod = "reconnect_period";
-const char* kServertype = "servertype";
-const char* kStreamDesc = "stream_desc";
-const char* kStreamGenre = "stream_genre";
-const char* kStreamName = "stream_name";
-const char* kStreamPublic = "stream_public";
-const char* kStreamWebsite = "stream_website";
-
-const double kDefaultBitrate = 128;
-const int kDefaultChannels = 2;
-const bool kDefaultEnableMetadata = false;
-const bool kDefaultEnableReconnect = true;
-const bool kDefaultLimitReconnects = true;
-const int kDefaultMaximumRetries = 10;
-// No tr() here, see https://bugs.launchpad.net/mixxx/+bug/1419500
-const QString kDefaultMetadataFormat("$artist - $title");
-const bool kDefaultNoDelayFirstReconnect = true;
-const bool kDefaultOggDynamicupdate = false;
-double kDefaultReconnectFirstDelay = 0.0;
-double kDefaultReconnectPeriod = 5.0;
-const QString kDefaultStreamDesc = QObject::tr("This stream is online for testing purposes!");
-const QString kDefaultStreamGenre = QObject::tr("Live Mix");
-const bool kDefaultStreamPublic = false;
+const char* kProfilesSubfolder = "broadcast_profiles";
+const char* kDefaultProfile = "Connection 1"; // Must be used only when initializing profiles
+const mixxx::Logger kLogger("BroadcastSettings");
 } // anonymous namespace
 
-BroadcastSettings::BroadcastSettings(UserSettingsPointer pConfig)
-    : m_pConfig(pConfig) {
-}
-
-int BroadcastSettings::getBitrate() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kBitrate), getDefaultBitrate());
-}
-
-void BroadcastSettings::setBitrate(int value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kBitrate), value);
-}
-
-int BroadcastSettings::getDefaultBitrate() const {
-    return kDefaultBitrate;
-}
-
-int BroadcastSettings::getChannels() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kChannels), getDefaultChannels());
-}
-
-void BroadcastSettings::setChannels(int value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kChannels), value);
-}
-
-int BroadcastSettings::getDefaultChannels() const {
-    return kDefaultChannels;
-}
-
-QString BroadcastSettings::getCustomArtist() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kCustomArtist), getDefaultCustomArtist());
-
-}
-
-void BroadcastSettings::setCustomArtist(const QString& value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kCustomArtist), value);
-}
-
-QString BroadcastSettings::getDefaultCustomArtist() const {
-    return QString();
-}
-
-QString BroadcastSettings::getCustomTitle() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kCustomTitle), getDefaultCustomTitle());
-}
-
-void BroadcastSettings::setCustomTitle(const QString& value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kCustomTitle), value);
-}
-
-QString BroadcastSettings::getDefaultCustomTitle() const {
-    return QString();
-}
-
-bool BroadcastSettings::getEnableMetadata() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kEnableMetadata), getDefaultEnableMetadata());
-}
-
-void BroadcastSettings::setEnableMetadata(bool value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kEnableMetadata), value);
-}
-
-bool BroadcastSettings::getDefaultEnableMetadata() const {
-    return kDefaultEnableMetadata;
-}
-
-bool BroadcastSettings::getEnableReconnect() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kEnableReconnect), getDefaultEnableReconnect());
-}
-
-void BroadcastSettings::setEnableReconnect(bool value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kEnableReconnect), value);
-}
-
-bool BroadcastSettings::getDefaultEnableReconnect() const {
-    return kDefaultEnableReconnect;
-}
-
-// Unused, but we keep this to reserve the name
-bool BroadcastSettings::getEnabled() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kEnabled), true);
-}
-
-void BroadcastSettings::setEnabled(bool value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kEnabled), value);
-}
-
-QString BroadcastSettings::getFormat() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kFormat), getDefaultFormat());
-}
-
-void BroadcastSettings::setFormat(const QString& value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kFormat), value);
-}
-
-QString BroadcastSettings::getDefaultFormat() const {
-    return QString();
-}
-
-QString BroadcastSettings::getHost() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kHost), getDefaultHost());
-}
-
-void BroadcastSettings::setHost(const QString& value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kHost), value);
-}
-
-QString BroadcastSettings::getDefaultHost() const {
-    return QString();
-}
-
-bool BroadcastSettings::getLimitReconnects() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kLimitReconnects), getDefaultLimitReconnects());
-}
-
-void BroadcastSettings::setLimitReconnects(bool value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kLimitReconnects), value);
-}
-
-bool BroadcastSettings::getDefaultLimitReconnects() const {
-    return kDefaultLimitReconnects;
-}
-
-QString BroadcastSettings::getLogin() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kLogin), getDefaultLogin());
-}
-
-void BroadcastSettings::setLogin(const QString& value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kLogin), value);
+BroadcastSettings::BroadcastSettings(
+        UserSettingsPointer pConfig, QObject* parent)
+    : QObject(parent),
+      m_pConfig(pConfig),
+      m_profiles() {
+    loadProfiles();
 }
 
-QString BroadcastSettings::getDefaultLogin() const {
-    return QString();
-}
-
-int BroadcastSettings::getMaximumRetries() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kMaximumRetries), getDefaultMaximumRetries());
-}
-
-void BroadcastSettings::setMaximumRetries(int value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kMaximumRetries), value);
-}
-
-int BroadcastSettings::getDefaultMaximumRetries() const {
-    return kDefaultMaximumRetries;
-}
-
-QString BroadcastSettings::getMetadataCharset() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kMetadataCharset));
-}
-
-void BroadcastSettings::setMetadataCharset(const QString& value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kMetadataCharset), value);
-}
-
-QString BroadcastSettings::getDefaultMetadataCharset() const {
-    return QString();
-}
-
-QString BroadcastSettings::getMetadataFormat() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kMetadataFormat), getDefaultMetadataFormat());
-}
-
-void BroadcastSettings::setMetadataFormat(const QString& value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kMetadataFormat), value);
-}
-
-QString BroadcastSettings::getDefaultMetadataFormat() const {
-    return kDefaultMetadataFormat;
-}
-
-QString BroadcastSettings::getMountpoint() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kMountPoint));
-}
-
-void BroadcastSettings::setMountPoint(const QString& value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kMountPoint), value);
-}
-
-QString BroadcastSettings::getDefaultMountpoint() const {
-    return QString();
-}
-
-bool BroadcastSettings::getNoDelayFirstReconnect() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kNoDelayFirstReconnect),
-            getDefaultNoDelayFirstReconnect());
-}
-
-void BroadcastSettings::setNoDelayFirstReconnect(bool value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kNoDelayFirstReconnect), value);
-}
-
-bool BroadcastSettings::getDefaultNoDelayFirstReconnect() const {
-    return kDefaultNoDelayFirstReconnect;
-}
-
-bool BroadcastSettings::getOggDynamicUpdate() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kOggDynamicUpdate),
-            getDefaultOggDynamicUpdate());
-}
-
-void BroadcastSettings::setOggDynamicUpdate(bool value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kOggDynamicUpdate), value);
-}
-
-bool BroadcastSettings::getDefaultOggDynamicUpdate() const {
-    return kDefaultOggDynamicupdate;
-}
-
-QString BroadcastSettings::getPassword() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kPassword), getDefaultPassword());
-}
-
-void BroadcastSettings::setPassword(const QString& value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kPassword), value);
-}
-
-QString BroadcastSettings::getDefaultPassword() const {
-    return QString();
-}
+void BroadcastSettings::loadProfiles() {
+    QDir profilesFolder(getProfilesFolder());
+    if(!profilesFolder.exists()) {
+        kLogger.info() << "Profiles folder doesn't exist. Creating it.";
+        profilesFolder.mkpath(profilesFolder.absolutePath());
+    }
 
-int BroadcastSettings::getPort() const {
-    // Valid port numbers are 0 .. 65535 (16 bit unsigned)
-    int port =  m_pConfig->getValue(
-            ConfigKey(kConfigKey, kPort), getDefaultPort());
-    if (port < 0 || port > 0xFFFF) {
-        return getDefaultPort();
+    QStringList nameFilters("*.bcp.xml");
+    QFileInfoList files =
+            profilesFolder.entryInfoList(nameFilters, QDir::Files, QDir::Name);
+
+    // If *.bcp.xml files exist in the profiles subfolder, those will be loaded
+    // and instanciated in the class' internal profile list for other by it and
+    // Mixxx subsystems related to Live Broadcasting.
+    // If that directory is empty (common reasons: it has been created by the
+    // code at the beginning, or all profiles were deleted) then a default
+    // profile with default values is created. That case could also mean that
+    // Mixxx has just been upgraded to a new version, so "legacy format" values
+    // has fetched from mixxx.cfg and loaded into the fresh default profile.
+    // It's important to take into account that the "legacy" settings are left
+    // in mixxx.cfg for retro-compatibility during alpha and beta testing.
+
+    if(files.size() > 0) {
+        kLogger.info() << "Found" << files.size() << "profile(s)";
+
+        // Load profiles from filesystem
+        for(QFileInfo fileInfo : files) {
+            BroadcastProfilePtr profile =
+                    BroadcastProfile::loadFromFile(fileInfo.absoluteFilePath());
+
+            if(profile)
+                addProfile(profile);
+        }
+    } else {
+        kLogger.info() << "No profiles found. Creating default profile.";
+
+        BroadcastProfilePtr defaultProfile(
+                    new BroadcastProfile(kDefaultProfile));
+        // Upgrade from mixxx.cfg format to XML (if required)
+        loadLegacySettings(defaultProfile);
+
+        addProfile(defaultProfile);
+        saveProfile(defaultProfile);
     }
-    return port;
 }
 
-void BroadcastSettings::setPort(int value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kPort), value);
-}
+bool BroadcastSettings::addProfile(BroadcastProfilePtr profile) {
+    if(!profile)
+        return false;
 
-int BroadcastSettings::getDefaultPort() const {
-    return BROADCAST_DEFAULT_PORT;
-}
+    if(m_profiles.size() >= BROADCAST_MAX_CONNECTIONS) {
+        kLogger.warning() << "addProfile: connection limit reached."
+                 << "can't add more than" << QString::number(BROADCAST_MAX_CONNECTIONS)
+                 << "connections.";
+        return false;
+    }
 
-double BroadcastSettings::getReconnectFirstDelay() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kReconnectFirstDelay),
-            getDefaultReconnectFirstDelay());
+    // It is best to avoid using QSharedPointer::data(), especially when
+    // passing it to another function, as it puts the associated pointer
+    // at risk of being manually deleted.
+    // However it's fine with Qt's connect because it can be trusted that
+    // it won't delete the pointer.
+    connect(profile.data(), SIGNAL(profileNameChanged(QString, QString)),
+            this, SLOT(onProfileNameChanged(QString,QString)));
+    connect(profile.data(), SIGNAL(connectionStatusChanged(int)),
+            this, SLOT(onConnectionStatusChanged(int)));
+    m_profiles.insert(profile->getProfileName(), BroadcastProfilePtr(profile));
+
+    emit profileAdded(profile);
+    return true;
+}
+
+BroadcastProfilePtr BroadcastSettings::createProfile(const QString& profileName) {
+    QFileInfo xmlFile(filePathForProfile(profileName));
+
+    if(!xmlFile.exists()) {
+        BroadcastProfilePtr profile(new BroadcastProfile(profileName));
+        if(addProfile(profile)) {
+            saveProfile(profile);
+            return profile;
+        }
+    }
+    return BroadcastProfilePtr(nullptr);
 }
 
-void BroadcastSettings::setReconnectFirstDelay(double value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kReconnectFirstDelay), value);
-}
+bool BroadcastSettings::saveProfile(BroadcastProfilePtr profile) {
+    if(!profile)
+        return false;
 
-double BroadcastSettings::getDefaultReconnectFirstDelay() const {
-    return kDefaultReconnectFirstDelay;
+    return profile->save(filePathForProfile(profile));
 }
 
-double BroadcastSettings::getReconnectPeriod() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kReconnectPeriod),
-            getDefaultReconnectPeriod());
+QString BroadcastSettings::filePathForProfile(const QString& profileName) {
+    QString filename = profileName + ".bcp.xml";
+    filename = BroadcastProfile::stripForbiddenChars(filename);
+    return QDir(getProfilesFolder()).absoluteFilePath(filename);
 }
 
-void BroadcastSettings::setReconnectPeriod(double value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kReconnectPeriod), value);
-}
+QString BroadcastSettings::filePathForProfile(BroadcastProfilePtr profile) {
+    if(!profile)
+        return QString();
 
-double BroadcastSettings::getDefaultReconnectPeriod() const {
-    return kDefaultReconnectPeriod;
+    return filePathForProfile(profile->getProfileName());
 }
 
-QString BroadcastSettings::getServertype() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kServertype), getDefaultServertype());
-}
+bool BroadcastSettings::deleteFileForProfile(BroadcastProfilePtr profile) {
+    if(!profile)
+        return false;
 
-void BroadcastSettings::setServertype(const QString& value) {
-    m_pConfig->set(ConfigKey(kConfigKey, kServertype),
-            ConfigValue(value));
+    return deleteFileForProfile(profile->getProfileName());
 }
 
-QString BroadcastSettings::getDefaultServertype() const {
-    return QString();
+bool BroadcastSettings::deleteFileForProfile(const QString& profileName) {
+    QFileInfo xmlFile(filePathForProfile(profileName));
+    if(xmlFile.exists()) {
+        return QFile::remove(xmlFile.absoluteFilePath());
+    }
+    return false;
 }
 
-QString BroadcastSettings::getStreamDesc() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kStreamDesc),
-            getDefaultStreamDesc());
+QString BroadcastSettings::getProfilesFolder() {
+    QString profilesPath(m_pConfig->getSettingsPath());
+    profilesPath.append(QDir::separator() + QString(kProfilesSubfolder));
+    return profilesPath;
 }
 
-void BroadcastSettings::setStreamDesc(const QString& value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kStreamDesc), value);
+void BroadcastSettings::saveAll() {
+    for(auto kv : m_profiles.values()) {
+        saveProfile(kv);
+    }
+    emit profilesChanged();
 }
 
-QString BroadcastSettings::getDefaultStreamDesc() const {
-    return kDefaultStreamDesc;
-}
+void BroadcastSettings::deleteProfile(BroadcastProfilePtr profile) {
+    if(!profile)
+        return;
 
-QString BroadcastSettings::getStreamGenre() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kStreamGenre),
-            getDefaultStreamGenre());
+    deleteFileForProfile(profile);
+    m_profiles.remove(profile->getProfileName());
+    emit profileRemoved(profile);
 }
 
-void BroadcastSettings::setStreamGenre(const QString& value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kStreamGenre), value);
-}
+void BroadcastSettings::onProfileNameChanged(QString oldName, QString newName) {
+    if(!m_profiles.contains(oldName))
+        return;
 
-QString BroadcastSettings::getDefaultStreamGenre() const {
-    return kDefaultStreamGenre;
-}
+    BroadcastProfilePtr profile = m_profiles.take(oldName);
+    if(profile) {
+        m_profiles.insert(newName, profile);
+        emit profileRenamed(oldName, profile);
 
-QString BroadcastSettings::getStreamName() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kStreamName),
-            getDefaultStreamName());
+        deleteFileForProfile(oldName);
+        saveProfile(profile);
+    }
 }
 
-void BroadcastSettings::setStreamName(const QString& value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kStreamName), value);
+void BroadcastSettings::onConnectionStatusChanged(int newStatus) {
+    Q_UNUSED(newStatus);
 }
 
-QString BroadcastSettings::getDefaultStreamName() const {
-    return QString();
+BroadcastProfilePtr BroadcastSettings::profileAt(int index) {
+    return m_profiles.values().value(index, BroadcastProfilePtr(nullptr));
 }
 
-bool BroadcastSettings::getStreamPublic() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kStreamPublic), getDefaultStreamPublic());
+QList<BroadcastProfilePtr> BroadcastSettings::profiles() {
+    return m_profiles.values();
 }
 
-void BroadcastSettings::setStreamPublic(bool value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kStreamPublic), value);
-}
+void BroadcastSettings::applyModel(BroadcastSettingsModel* pModel) {
+    if(!pModel) {
+        return;
+    }
+    // TODO(Palakis): lock both lists against modifications while syncing
+
+    // Step 1: find profiles to delete from the settings
+    for(BroadcastProfilePtr actualProfile : m_profiles.values()) {
+        QString profileName = actualProfile->getProfileName();
+        if(!pModel->getProfileByName(profileName)) {
+            // If profile exists in settings but not in the model,
+            // remove the profile from the settings
+            deleteProfile(actualProfile);
+        }
+    }
 
-bool BroadcastSettings::getDefaultStreamPublic() const {
-    return kDefaultStreamPublic;
-}
+    // Step 2: add new profiles
+    for(BroadcastProfilePtr profileCopy : pModel->profiles()) {
+        // Check if profile already exists in settings
+        BroadcastProfilePtr existingProfile =
+                m_profiles.value(profileCopy->getProfileName());
+        if(!existingProfile) {
+            // If no profile with the same name exists, add the new
+            // profile to the settings.
+            // The BroadcastProfile instance is a copy to separate it
+            // from its existence in the model
+            addProfile(profileCopy->valuesCopy());
+        }
+    }
 
-QString BroadcastSettings::getStreamWebsite() const {
-    return m_pConfig->getValue(
-            ConfigKey(kConfigKey, kStreamWebsite), getDefaultStreamWebsite());
-}
+    // Step 3: update existing profiles
+    for(BroadcastProfilePtr profileCopy : pModel->profiles()) {
+        BroadcastProfilePtr actualProfile =
+                m_profiles.value(profileCopy->getProfileName());
+        if(actualProfile) {
+            profileCopy->copyValuesTo(actualProfile);
+        }
+    }
 
-void BroadcastSettings::setStreamWebsite(const QString& value) {
-    m_pConfig->setValue(ConfigKey(kConfigKey, kStreamWebsite), value);
+    saveAll();
 }
 
-QString BroadcastSettings::getDefaultStreamWebsite() const {
-    return MIXXX_WEBSITE_URL;
-}
diff --git a/src/preferences/broadcastsettings.h b/src/preferences/broadcastsettings.h
index 9c759bed5b3..61c1f6c47bb 100644
--- a/src/preferences/broadcastsettings.h
+++ b/src/preferences/broadcastsettings.h
@@ -1,97 +1,57 @@
 #ifndef PREFERENCES_BROADCASTSETTINGS_H
 #define PREFERENCES_BROADCASTSETTINGS_H
 
+#include <QMap>
+#include <QSharedPointer>
+#include <QString>
+
 #include "preferences/usersettings.h"
+#include "preferences/broadcastsettingsmodel.h"
+#include "preferences/broadcastprofile.h"
 #include "track/track.h"
 
-class BroadcastSettings {
+class BroadcastSettings : public QObject {
+  Q_OBJECT
+
   public:
-    BroadcastSettings(UserSettingsPointer pConfig);
+    BroadcastSettings(UserSettingsPointer pConfig, QObject* parent = nullptr);
+
+    bool saveProfile(BroadcastProfilePtr profile);
+    void saveAll();
+    BroadcastProfilePtr createProfile(const QString& profileName);
+    QList<BroadcastProfilePtr> profiles();
+    BroadcastProfilePtr profileAt(int index);
+
+    void applyModel(BroadcastSettingsModel* pModel);
+
+  signals:
+    void profileAdded(BroadcastProfilePtr profile);
+    void profileRemoved(BroadcastProfilePtr profile);
+    void profileRenamed(QString oldName, BroadcastProfilePtr profile);
+    void profilesChanged();
 
-    int getBitrate() const;
-    void setBitrate(int value);
-    int getDefaultBitrate() const;
-    int getChannels() const;
-    void setChannels(int value);
-    int getDefaultChannels() const;
-    QString getCustomArtist() const;
-    void setCustomArtist(const QString& value);
-    QString getDefaultCustomArtist() const;
-    QString getCustomTitle() const;
-    void setCustomTitle(const QString& value);
-    QString getDefaultCustomTitle() const;
-    bool getEnableMetadata() const;
-    void setEnableMetadata(bool value);
-    bool getDefaultEnableMetadata() const;
-    bool getEnableReconnect() const;
-    void setEnableReconnect(bool value);
-    bool getDefaultEnableReconnect() const;
-    bool getEnabled() const;
-    void setEnabled(bool value);
-    QString getFormat() const;
-    void setFormat(const QString& value);
-    QString getDefaultFormat() const;
-    QString getHost() const;
-    void setHost(const QString& value);
-    QString getDefaultHost() const;
-    bool getLimitReconnects() const;
-    void setLimitReconnects(bool value);
-    bool getDefaultLimitReconnects() const;
-    QString getLogin() const;
-    void setLogin(const QString& value);
-    QString getDefaultLogin() const;
-    int getMaximumRetries() const;
-    void setMaximumRetries(int value);
-    int getDefaultMaximumRetries() const;
-    QString getMetadataCharset() const;
-    void setMetadataCharset(const QString& value);
-    QString getDefaultMetadataCharset() const;
-    QString getMetadataFormat() const;
-    void setMetadataFormat(const QString& value);
-    QString getDefaultMetadataFormat() const;
-    QString getMountpoint() const;
-    void setMountPoint(const QString& value);
-    QString getDefaultMountpoint() const;
-    bool getNoDelayFirstReconnect() const;
-    void setNoDelayFirstReconnect(bool value);
-    bool getDefaultNoDelayFirstReconnect() const;
-    bool getOggDynamicUpdate() const;
-    void setOggDynamicUpdate(bool value);
-    bool getDefaultOggDynamicUpdate() const;
-    QString getPassword() const;
-    void setPassword(const QString& value);
-    QString getDefaultPassword() const;
-    int getPort() const;
-    void setPort(int value);
-    int getDefaultPort() const;
-    double getReconnectFirstDelay() const;
-    void setReconnectFirstDelay(double value);
-    double getDefaultReconnectFirstDelay() const;
-    double getReconnectPeriod() const;
-    void setReconnectPeriod(double value);
-    double getDefaultReconnectPeriod() const;
-    QString getServertype() const;
-    void setServertype(const QString& value);
-    QString getDefaultServertype() const;
-    QString getStreamDesc() const;
-    void setStreamDesc(const QString& value);
-    QString getDefaultStreamDesc() const;
-    QString getStreamGenre() const;
-    void setStreamGenre(const QString& value);
-    QString getDefaultStreamGenre() const;
-    QString getStreamName() const;
-    void setStreamName(const QString& value);
-    QString getDefaultStreamName() const;
-    bool getStreamPublic() const;
-    void setStreamPublic(bool value);
-    bool getDefaultStreamPublic() const;
-    QString getStreamWebsite() const;
-    void setStreamWebsite(const QString& value);
-    QString getDefaultStreamWebsite() const;
+  private slots:
+    void onProfileNameChanged(QString oldName, QString newName);
+    void onConnectionStatusChanged(int newStatus);
 
   private:
+    void loadProfiles();
+    bool addProfile(BroadcastProfilePtr profile);
+    void deleteProfile(BroadcastProfilePtr profile);
+
+    QString filePathForProfile(BroadcastProfilePtr profile);
+    QString filePathForProfile(const QString& profileName);
+    bool deleteFileForProfile(BroadcastProfilePtr profile);
+    bool deleteFileForProfile(const QString& profileName);
+    QString getProfilesFolder();
+
+    void loadLegacySettings(BroadcastProfilePtr profile);
+
     // Pointer to config object
     UserSettingsPointer m_pConfig;
+    QMap<QString, BroadcastProfilePtr> m_profiles;
 };
 
+typedef QSharedPointer<BroadcastSettings> BroadcastSettingsPointer;
+
 #endif /* PREFERENCES_BROADCASTSETTINGS_H */
diff --git a/src/preferences/broadcastsettings_legacy.cpp b/src/preferences/broadcastsettings_legacy.cpp
new file mode 100644
index 00000000000..60a94437091
--- /dev/null
+++ b/src/preferences/broadcastsettings_legacy.cpp
@@ -0,0 +1,146 @@
+#include "preferences/broadcastsettings.h"
+
+namespace {
+const char* kConfigKey = "[Shoutcast]";
+const char* kBitrate = "bitrate";
+const char* kChannels = "channels";
+const char* kCustomArtist = "custom_artist";
+const char* kCustomTitle = "custom_title";
+const char* kEnableMetadata = "enable_metadata";
+const char* kEnableReconnect = "enable_reconnect";
+const char* kFormat = "format";
+const char* kHost = "host";
+const char* kLimitReconnects = "limit_reconnects";
+const char* kLogin = "login";
+const char* kMaximumRetries = "maximum_retries";
+const char* kMetadataCharset = "metadata_charset";
+const char* kMetadataFormat = "metadata_format";
+const char* kMountPoint = "mountpoint";
+const char* kNoDelayFirstReconnect = "no_delay_first_reconnect";
+const char* kOggDynamicUpdate = "ogg_dynamicupdate";
+const char* kPassword = "password";
+const char* kPort = "port";
+const char* kReconnectFirstDelay = "reconnect_first_delay";
+const char* kReconnectPeriod = "reconnect_period";
+const char* kServertype = "servertype";
+const char* kStreamDesc = "stream_desc";
+const char* kStreamGenre = "stream_genre";
+const char* kStreamName = "stream_name";
+const char* kStreamPublic = "stream_public";
+const char* kStreamWebsite = "stream_website";
+}
+
+void BroadcastSettings::loadLegacySettings(BroadcastProfilePtr profile) {
+    if(!profile)
+        return;
+
+    // For each value, the current value is kept if it can't be found in the
+    // general settings file.
+    profile->setHost(m_pConfig->getValue(
+                         ConfigKey(kConfigKey, kHost),
+                         profile->getHost()));
+
+    profile->setPort(m_pConfig->getValue(
+                         ConfigKey(kConfigKey, kPort),
+                         profile->getPort()));
+
+    profile->setServertype(m_pConfig->getValue(
+                               ConfigKey(kConfigKey, kServertype),
+                               profile->getServertype()));
+
+    profile->setLogin(m_pConfig->getValue(
+                          ConfigKey(kConfigKey, kLogin),
+                          profile->getLogin()));
+
+    profile->setPassword(m_pConfig->getValue(
+                             ConfigKey(kConfigKey, kPassword),
+                             profile->getPassword()));
+
+    profile->setEnableReconnect(m_pConfig->getValue(
+                                    ConfigKey(kConfigKey, kEnableReconnect),
+                                    profile->getEnableReconnect()));
+
+    profile->setReconnectPeriod(m_pConfig->getValue(
+                                    ConfigKey(kConfigKey, kReconnectPeriod),
+                                    profile->getReconnectPeriod()));
+
+    profile->setLimitReconnects(m_pConfig->getValue(
+                                    ConfigKey(kConfigKey, kLimitReconnects),
+                                    profile->getLimitReconnects()));
+
+    profile->setMountPoint(m_pConfig->getValue(
+                               ConfigKey(kConfigKey, kMountPoint),
+                               profile->getMountpoint()));
+
+    profile->setStreamDesc(m_pConfig->getValue(
+                               ConfigKey(kConfigKey, kStreamDesc),
+                               profile->getStreamDesc()));
+
+    profile->setStreamGenre(m_pConfig->getValue(
+                                ConfigKey(kConfigKey, kStreamGenre),
+                                profile->getStreamGenre()));
+
+    profile->setStreamName(m_pConfig->getValue(
+                               ConfigKey(kConfigKey, kStreamName),
+                               profile->getStreamName()));
+
+    profile->setStreamPublic(m_pConfig->getValue(
+                                 ConfigKey(kConfigKey, kStreamPublic),
+                                 profile->getStreamPublic()));
+
+    profile->setStreamWebsite(m_pConfig->getValue(
+                                  ConfigKey(kConfigKey, kStreamWebsite),
+                                  profile->getStreamWebsite()));
+
+    profile->setEnableMetadata(m_pConfig->getValue(
+                                   ConfigKey(kConfigKey, kEnableMetadata),
+                                   profile->getEnableMetadata()));
+
+    profile->setMetadataCharset(m_pConfig->getValue(
+                                    ConfigKey(kConfigKey, kMetadataCharset),
+                                    profile->getMetadataCharset()));
+
+    profile->setCustomArtist(m_pConfig->getValue(
+                                 ConfigKey(kConfigKey, kCustomArtist),
+                                 profile->getCustomArtist()));
+
+    profile->setCustomTitle(m_pConfig->getValue(
+                                ConfigKey(kConfigKey, kCustomTitle),
+                                profile->getCustomTitle()));
+
+    profile->setMetadataFormat(m_pConfig->getValue(
+                                   ConfigKey(kConfigKey, kMetadataFormat),
+                                   profile->getMetadataFormat()));
+
+    profile->setOggDynamicUpdate(m_pConfig->getValue(
+                                     ConfigKey(kConfigKey, kOggDynamicUpdate),
+                                     profile->getOggDynamicUpdate()));
+
+    profile->setBitrate(m_pConfig->getValue(
+                            ConfigKey(kConfigKey, kBitrate),
+                            profile->getBitrate()));
+
+    profile->setChannels(m_pConfig->getValue(
+                             ConfigKey(kConfigKey, kChannels),
+                             profile->getChannels()));
+
+    profile->setFormat(m_pConfig->getValue(
+                           ConfigKey(kConfigKey, kFormat),
+                           profile->getFormat()));
+
+    profile->setNoDelayFirstReconnect(
+                m_pConfig->getValue(
+                    ConfigKey(kConfigKey, kNoDelayFirstReconnect),
+                    profile->getNoDelayFirstReconnect()));
+
+    profile->setReconnectFirstDelay(
+                m_pConfig->getValue(
+                    ConfigKey(kConfigKey, kReconnectFirstDelay),
+                    profile->getReconnectFirstDelay()));
+
+    profile->setMaximumRetries(m_pConfig->getValue(
+                                   ConfigKey(kConfigKey, kMaximumRetries),
+                                   profile->getMaximumRetries()));
+
+    profile->setEnabled(true);
+}
diff --git a/src/preferences/broadcastsettingsmodel.cpp b/src/preferences/broadcastsettingsmodel.cpp
new file mode 100644
index 00000000000..81f733183b6
--- /dev/null
+++ b/src/preferences/broadcastsettingsmodel.cpp
@@ -0,0 +1,230 @@
+// broadcastsettingsmodel.cpp
+// Created on August 7th by Stéphane Lepin (Palakis)
+
+#include <preferences/broadcastsettingsmodel.h>
+
+#include <preferences/broadcastsettings.h>
+
+namespace {
+const int kColumnEnabled = 0;
+const int kColumnName = 1;
+const int kColumnStatus = 2;
+}
+
+BroadcastSettingsModel::BroadcastSettingsModel() {
+}
+
+void BroadcastSettingsModel::resetFromSettings(BroadcastSettingsPointer pSettings) {
+    if(!pSettings) {
+        return;
+    }
+
+    beginRemoveRows(QModelIndex(), 0, m_profiles.size()-1);
+    endRemoveRows();
+    m_profiles.clear();
+
+    for(BroadcastProfilePtr profile : pSettings->profiles()) {
+        BroadcastProfilePtr copy = profile->valuesCopy();
+        copy->setConnectionStatus(profile->connectionStatus());
+        connect(profile.data(), SIGNAL(statusChanged(bool)),
+                copy.data(), SLOT(relayStatus(bool)));
+        connect(profile.data(), SIGNAL(connectionStatusChanged(int)),
+                copy.data(), SLOT(relayConnectionStatus(int)));
+        addProfileToModel(copy);
+    }
+}
+
+bool BroadcastSettingsModel::addProfileToModel(BroadcastProfilePtr profile) {
+    if(!profile)
+        return false;
+
+    int position = m_profiles.size();
+    beginInsertRows(QModelIndex(), position, position);
+
+    // It is best to avoid using QSharedPointer::data(), especially when
+    // passing it to another function, as it puts the associated pointer
+    // at risk of being manually deleted.
+    // However it's fine with Qt's connect because it can be trusted that
+    // it won't delete the pointer.
+    connect(profile.data(), SIGNAL(profileNameChanged(QString, QString)),
+            this, SLOT(onProfileNameChanged(QString,QString)));
+    connect(profile.data(), SIGNAL(connectionStatusChanged(int)),
+            this, SLOT(onConnectionStatusChanged(int)));
+    m_profiles.insert(profile->getProfileName(), BroadcastProfilePtr(profile));
+
+    endInsertRows();
+    return true;
+}
+
+void BroadcastSettingsModel::deleteProfileFromModel(BroadcastProfilePtr profile) {
+    if(!profile)
+        return;
+
+    int position = m_profiles.keys().indexOf(profile->getProfileName());
+    if(position > -1) {
+        beginRemoveRows(QModelIndex(), position, position);
+        endRemoveRows();
+    }
+    m_profiles.remove(profile->getProfileName());
+}
+
+BroadcastProfilePtr BroadcastSettingsModel::getProfileByName(
+        const QString& profileName) {
+    return m_profiles.value(profileName, BroadcastProfilePtr());
+}
+
+int BroadcastSettingsModel::rowCount(const QModelIndex& parent) const {
+    Q_UNUSED(parent);
+    return m_profiles.size();
+}
+
+int BroadcastSettingsModel::columnCount(const QModelIndex& parent) const {
+    Q_UNUSED(parent);
+    return 3;
+}
+
+QVariant BroadcastSettingsModel::data(const QModelIndex& index, int role) const {
+    int rowIndex = index.row();
+    if (!index.isValid() || rowIndex >= m_profiles.size())
+        return QVariant();
+
+    BroadcastProfilePtr profile = m_profiles.values().at(rowIndex);
+    if (profile) {
+        int column = index.column();
+        if (column == kColumnEnabled) {
+            if (role == Qt::CheckStateRole) {
+                return (profile->getEnabled() == true ? Qt::Checked : Qt::Unchecked);
+            }
+            else if (role == Qt::TextAlignmentRole) {
+                return Qt::AlignCenter;
+            }
+        }
+        else if (column == kColumnName && role == Qt::DisplayRole) {
+            return profile->getProfileName();
+        }
+        else if (column == kColumnStatus) {
+            if (role == Qt::DisplayRole) {
+                return connectionStatusString(profile);
+            }
+            else if (role == Qt::BackgroundRole) {
+                return QBrush(connectionStatusColor(profile));
+            }
+            else if (role == Qt::TextAlignmentRole) {
+                return Qt::AlignCenter;
+            }
+        }
+    }
+
+    return QVariant();
+}
+
+QVariant BroadcastSettingsModel::headerData(int section, Qt::Orientation orientation,
+        int role) const {
+    if(orientation == Qt::Horizontal) {
+        if(role == Qt::DisplayRole) {
+            if(section == kColumnEnabled) {
+                return tr("Enabled");
+            } else if(section == kColumnName) {
+                return tr("Name");
+            } else if(section == kColumnStatus) {
+                return tr("Status");
+            }
+        }
+    }
+    return QVariant();
+}
+
+Qt::ItemFlags BroadcastSettingsModel::flags(const QModelIndex& index) const {
+    if(index.column() == kColumnEnabled)
+        return QAbstractItemModel::flags(index) | Qt::ItemIsUserCheckable;
+
+    if(index.column() == kColumnName)
+        return QAbstractItemModel::flags(index) | Qt::ItemIsSelectable;
+
+    return QAbstractItemModel::flags(index) | Qt::ItemIsEnabled;
+}
+
+bool BroadcastSettingsModel::setData(const QModelIndex& index, const QVariant& value, int role) {
+    if(index.isValid()) {
+        BroadcastProfilePtr profile = m_profiles.values().at(index.row());
+        if(profile) {
+            if(index.column() == kColumnEnabled && role == Qt::CheckStateRole) {
+                profile->setEnabled(value.toBool());
+            }
+            if(index.column() == kColumnName && role == Qt::EditRole) {
+                QString newName = value.toString();
+                newName = newName.trimmed();
+
+                if(!newName.isNull() && !newName.isEmpty())
+                    profile->setProfileName(newName);
+            }
+        }
+    }
+    return true;
+}
+
+QAbstractItemDelegate* BroadcastSettingsModel::delegateForColumn(const int i, QObject* parent) {
+    Q_UNUSED(i);
+    Q_UNUSED(parent);
+    return nullptr;
+}
+
+QString BroadcastSettingsModel::connectionStatusString(BroadcastProfilePtr profile) {
+    int status = profile->connectionStatus();
+    switch(status) {
+        case BroadcastProfile::STATUS_UNCONNECTED:
+            return tr("Disconnected");
+        case BroadcastProfile::STATUS_CONNECTING:
+            return tr("Connecting...");
+        case BroadcastProfile::STATUS_CONNECTED:
+            return tr("Connected");
+        case BroadcastProfile::STATUS_FAILURE:
+            return tr("Failed");
+
+        default:
+            return tr("Unknown");
+    }
+}
+
+QColor BroadcastSettingsModel::connectionStatusColor(BroadcastProfilePtr profile) {
+    // Manual colors below were picked using Google's color picker (query: colorpicker)
+    //
+    int status = profile->connectionStatus();
+        switch(status) {
+            case BroadcastProfile::STATUS_UNCONNECTED:
+                return Qt::white;
+            case BroadcastProfile::STATUS_CONNECTING:
+                return QColor(25, 224, 255); // turquoise blue
+            case BroadcastProfile::STATUS_CONNECTED:
+                return QColor(96, 255, 81); // warm green
+            case BroadcastProfile::STATUS_FAILURE:
+                return QColor(255, 228, 56); // toned-down yellow
+
+            default:
+                return Qt::white;
+        }
+}
+
+void BroadcastSettingsModel::onProfileNameChanged(QString oldName, QString newName) {
+    if(!m_profiles.contains(oldName))
+        return;
+
+    BroadcastProfilePtr profile = m_profiles.take(oldName);
+    if(profile) {
+        m_profiles.insert(newName, profile);
+    }
+
+    // Refresh the whole name column
+    QModelIndex start = this->index(0, kColumnName);
+    QModelIndex end = this->index(this->rowCount()-1, kColumnName);
+    emit dataChanged(start, end);
+}
+
+void BroadcastSettingsModel::onConnectionStatusChanged(int newStatus) {
+    Q_UNUSED(newStatus);
+    // Refresh the whole status column
+    QModelIndex start = this->index(0, kColumnStatus);
+    QModelIndex end = this->index(this->rowCount()-1, kColumnStatus);
+    emit dataChanged(start, end);
+}
+
diff --git a/src/preferences/broadcastsettingsmodel.h b/src/preferences/broadcastsettingsmodel.h
new file mode 100644
index 00000000000..e87de8be155
--- /dev/null
+++ b/src/preferences/broadcastsettingsmodel.h
@@ -0,0 +1,51 @@
+// broadcastsettingsmodel.h
+// Created on August 7th by Stéphane Lepin (Palakis)
+
+#ifndef PREFERENCES_BROADCASTSETTINGSMODEL_H
+#define PREFERENCES_BROADCASTSETTINGSMODEL_H
+
+#include <QAbstractTableModel>
+#include <QAbstractItemDelegate>
+#include <QMap>
+#include <QVariant>
+
+#include "preferences/broadcastprofile.h"
+
+class BroadcastSettings;
+typedef QSharedPointer<BroadcastSettings> BroadcastSettingsPointer;
+
+class BroadcastSettingsModel : public QAbstractTableModel {
+  Q_OBJECT
+  public:
+    BroadcastSettingsModel();
+
+    void resetFromSettings(BroadcastSettingsPointer pSettings);
+    bool addProfileToModel(BroadcastProfilePtr profile);
+    void deleteProfileFromModel(BroadcastProfilePtr profile);
+    BroadcastProfilePtr getProfileByName(const QString& profileName);
+    QList<BroadcastProfilePtr> profiles() {
+        return m_profiles.values();
+    }
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const;
+    int columnCount(const QModelIndex& parent = QModelIndex()) const;
+    QVariant headerData(int section, Qt::Orientation orientation,
+            int role = Qt::DisplayRole) const;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
+    Qt::ItemFlags flags(const QModelIndex& index) const;
+    bool setData(const QModelIndex& index, const QVariant& value,
+            int role = Qt::EditRole);
+    QAbstractItemDelegate* delegateForColumn(const int i, QObject* parent);
+
+  private slots:
+    void onProfileNameChanged(QString oldName, QString newName);
+    void onConnectionStatusChanged(int newStatus);
+
+  private:
+    static QString connectionStatusString(BroadcastProfilePtr profile);
+    static QColor connectionStatusColor(BroadcastProfilePtr profile);
+
+    QMap<QString, BroadcastProfilePtr> m_profiles;
+};
+
+#endif // PREFERENCES_BROADCASTSETTINGSMODEL_H
diff --git a/src/preferences/dialog/dlgprefbroadcast.cpp b/src/preferences/dialog/dlgprefbroadcast.cpp
index f22c03c1b4f..c5d80ce496a 100644
--- a/src/preferences/dialog/dlgprefbroadcast.cpp
+++ b/src/preferences/dialog/dlgprefbroadcast.cpp
@@ -1,125 +1,401 @@
 #include <QtDebug>
+#include <QInputDialog>
+#include <QMetaMethod>
+#include <QMetaProperty>
+#include <QAbstractItemDelegate>
+#include <QMessageBox>
+#include <QHeaderView>
 
 #include "broadcast/defs_broadcast.h"
 #include "control/controlproxy.h"
 #include "defs_urls.h"
 #include "preferences/dialog/dlgprefbroadcast.h"
 #include "encoder/encodersettings.h"
+#include "util/logger.h"
+
+namespace {
+const char* kSettingsGroupHeader = "Settings for %1";
+const int kColumnEnabled = 0;
+const int kColumnName = 1;
+const int kColumnStatus = 2;
+const mixxx::Logger kLogger("DlgPrefBroadcast");
+}
 
-DlgPrefBroadcast::DlgPrefBroadcast(QWidget *parent, UserSettingsPointer _config)
+DlgPrefBroadcast::DlgPrefBroadcast(QWidget *parent,
+                                   BroadcastSettingsPointer pBroadcastSettings)
         : DlgPreferencePage(parent),
-          m_settings(_config) {
+          m_pBroadcastSettings(pBroadcastSettings),
+          m_pSettingsModel(new BroadcastSettingsModel()),
+          m_pProfileListSelection(nullptr) {
     setupUi(this);
 
+#ifndef __QTKEYCHAIN__
+    // If secure storage is disabled, hide the radio buttons
+    // and force the value to false.
+    rbPasswordKeychain->setChecked(false);
+    rbPasswordCleartext->setChecked(true);
+
+    rbPasswordKeychain->setEnabled(false);
+    groupPasswordStorage->setVisible(false);
+#endif
+
+    connect(connectionList->horizontalHeader(), SIGNAL(sectionResized(int, int, int)),
+            this, SLOT(onSectionResized()));
+
+    updateModel();
+    connectionList->setModel(m_pSettingsModel);
+
+    connect(connectionList->selectionModel(),
+            SIGNAL(currentChanged(const QModelIndex&, const QModelIndex&)),
+            this,
+            SLOT(profileListItemSelected(const QModelIndex&, const QModelIndex&)));
+    connect(btnRemoveConnection, SIGNAL(clicked(bool)),
+            this, SLOT(btnRemoveConnectionClicked()));
+    connect(btnRenameConnection, SIGNAL(clicked(bool)),
+            this, SLOT(btnRenameConnectionClicked()));
+    connect(btnCreateConnection, SIGNAL(clicked(bool)),
+            this, SLOT(btnCreateConnectionClicked()));
+
+    connect(btnDisconnectAll, SIGNAL(clicked(bool)),
+            this, SLOT(btnDisconnectAllClicked()));
+
+    // Highlight first row
+    connectionList->selectRow(0);
+
     m_pBroadcastEnabled = new ControlProxy(
             BROADCAST_PREF_KEY, "enabled", this);
     m_pBroadcastEnabled->connectValueChanged(
             SLOT(broadcastEnabledChanged(double)));
 
-
-    // Enable live broadcasting checkbox
-    enableLiveBroadcasting->setChecked(
-            m_pBroadcastEnabled->toBool());
-
     //Server type combobox
     comboBoxServerType->addItem(tr("Icecast 2"), BROADCAST_SERVER_ICECAST2);
     comboBoxServerType->addItem(tr("Shoutcast 1"), BROADCAST_SERVER_SHOUTCAST);
     comboBoxServerType->addItem(tr("Icecast 1"), BROADCAST_SERVER_ICECAST1);
 
-    int tmp_index = comboBoxServerType->findData(m_settings.getServertype());
+    // Encoding bitrate combobox
+    QString kbps_pattern = QString("%1 kbps");
+    QList<int> valid_kpbs;
+    valid_kpbs << BROADCAST_BITRATE_320KBPS
+               << BROADCAST_BITRATE_256KBPS
+               << BROADCAST_BITRATE_224KBPS
+               << BROADCAST_BITRATE_192KBPS
+               << BROADCAST_BITRATE_160KBPS
+               << BROADCAST_BITRATE_128KBPS
+               << BROADCAST_BITRATE_112KBPS
+               << BROADCAST_BITRATE_96KBPS
+               << BROADCAST_BITRATE_80KBPS
+               << BROADCAST_BITRATE_64KBPS
+               << BROADCAST_BITRATE_48KBPS
+               << BROADCAST_BITRATE_32KBPS;
+     foreach (int kbps, valid_kpbs) {
+         comboBoxEncodingBitrate->addItem(
+                 kbps_pattern.arg(QString::number(kbps)), kbps);
+     }
+
+     // Encoding format combobox
+     comboBoxEncodingFormat->addItem(tr("MP3"), BROADCAST_FORMAT_MP3);
+     comboBoxEncodingFormat->addItem(tr("Ogg Vorbis"), BROADCAST_FORMAT_OV);
+
+     // Encoding channels combobox
+     comboBoxEncodingChannels->addItem(tr("Automatic"),
+             static_cast<int>(EncoderSettings::ChannelMode::AUTOMATIC));
+     comboBoxEncodingChannels->addItem(tr("Mono"),
+             static_cast<int>(EncoderSettings::ChannelMode::MONO));
+     comboBoxEncodingChannels->addItem(tr("Stereo"),
+             static_cast<int>(EncoderSettings::ChannelMode::STEREO));
+
+     BroadcastProfilePtr pProfile = m_pBroadcastSettings->profileAt(0);
+     getValuesFromProfile(pProfile);
+
+     connect(checkBoxEnableReconnect, SIGNAL(stateChanged(int)),
+             this, SLOT(checkBoxEnableReconnectChanged(int)));
+
+     connect(checkBoxLimitReconnects, SIGNAL(stateChanged(int)),
+             this, SLOT(checkBoxLimitReconnectsChanged(int)));
+
+     connect(enableCustomMetadata, SIGNAL(stateChanged(int)),
+             this, SLOT(enableCustomMetadataChanged(int)));
+}
+
+DlgPrefBroadcast::~DlgPrefBroadcast() {
+    delete m_pSettingsModel;
+}
+
+void DlgPrefBroadcast::slotResetToDefaults() {
+}
+
+void DlgPrefBroadcast::slotUpdate() {
+    updateModel();
+    connectOnApply->setChecked(false);
+
+    // Force select an item to have the current selection
+    // set to a profile pointer belonging to the model
+    connectionList->selectRow(0);
+
+    // Don't let user modify information if
+    // sending is enabled.
+    bool enabled = m_pBroadcastEnabled->toBool();
+    groupBoxProfileSettings->setEnabled(!enabled);
+    btnCreateConnection->setEnabled(!enabled);
+    btnRemoveConnection->setEnabled(!enabled);
+    btnRenameConnection->setEnabled(!enabled);
+    connectOnApply->setEnabled(!enabled);
+
+    btnDisconnectAll->setEnabled(enabled);
+}
+
+void DlgPrefBroadcast::applyModel() {
+    if(m_pProfileListSelection) {
+        setValuesToProfile(m_pProfileListSelection);
+    }
+    m_pBroadcastSettings->applyModel(m_pSettingsModel);
+    updateModel();
+}
+
+void DlgPrefBroadcast::slotApply() {
+    // Make sure the currently selected connection
+    // gets saved as expected
+    setValuesToProfile(m_pProfileListSelection);
+
+    // Check for Icecast connections with identical mountpoints on the same host
+    QMap<QString, QString> mountpoints;
+    for(BroadcastProfilePtr profile : m_pSettingsModel->profiles()) {
+        if (profile->getServertype() != BROADCAST_SERVER_ICECAST2) {
+            continue;
+        }
+
+        QString profileName = profile->getProfileName();
+        QString profileMountpoint = profile->getMountpoint();
+        if (mountpoints.values().contains(profileMountpoint)) {
+            QString profileNameWithSameMountpoint = mountpoints.key(profileMountpoint);
+            BroadcastProfilePtr profileWithSameMountpoint =
+                m_pSettingsModel->getProfileByName(profileNameWithSameMountpoint);
+
+            if (!profileWithSameMountpoint.isNull()
+                && profileWithSameMountpoint->getHost().toLower()
+                    == profile->getHost().toLower()) {
+                QMessageBox::warning(
+                    this, tr("Action failed"),
+                    tr("'%1' has the same Icecast mountpoint as '%2'.\n"
+                       "Two connections on the same server can't have the same mountpoint.")
+                       .arg(profileName).arg(profileNameWithSameMountpoint));
+                return;
+            }
+        }
+
+        mountpoints.insert(profileName, profileMountpoint);
+    }
+
+    applyModel();
+    bool broadcastingEnabled = m_pBroadcastEnabled->toBool();
+    if(!broadcastingEnabled && connectOnApply->isChecked()) {
+        m_pBroadcastEnabled->set(true);
+
+        // Reset state of "Connect on Apply" checkbox
+        connectOnApply->setChecked(false);
+    }
+
+    // Don't let user modify information if
+    // sending is enabled.
+    bool enabled = m_pBroadcastEnabled->toBool();
+    groupBoxProfileSettings->setEnabled(!enabled);
+    btnCreateConnection->setEnabled(!enabled);
+    btnRemoveConnection->setEnabled(!enabled);
+    btnRenameConnection->setEnabled(!enabled);
+    connectOnApply->setEnabled(!enabled);
+
+    btnDisconnectAll->setEnabled(enabled);
+}
+
+void DlgPrefBroadcast::broadcastEnabledChanged(double value) {
+    kLogger.debug() << "broadcastEnabledChanged()" << value;
+    bool enabled = (value == 1.0); // 0 and 2 are disabled
+
+    groupBoxProfileSettings->setEnabled(!enabled);
+    btnCreateConnection->setEnabled(!enabled);
+    btnRemoveConnection->setEnabled(!enabled);
+    btnRenameConnection->setEnabled(!enabled);
+    connectOnApply->setEnabled(!enabled);
+
+    btnDisconnectAll->setEnabled(enabled);
+}
+
+void DlgPrefBroadcast::checkBoxEnableReconnectChanged(int value) {
+    widgetReconnectControls->setEnabled(value);
+}
+
+void DlgPrefBroadcast::checkBoxLimitReconnectsChanged(int value) {
+    spinBoxMaximumRetries->setEnabled(value);
+}
+
+void DlgPrefBroadcast::enableCustomMetadataChanged(int value) {
+    custom_artist->setEnabled(value);
+    custom_title->setEnabled(value);
+}
+
+void DlgPrefBroadcast::btnCreateConnectionClicked() {
+    if(m_pSettingsModel->rowCount() >= BROADCAST_MAX_CONNECTIONS) {
+        QMessageBox::warning(this, tr("Action failed"),
+                tr("You can't create more than %1 Live Broadcasting connections.")
+                .arg(BROADCAST_MAX_CONNECTIONS));
+        return;
+    }
+  
+    int profileNumber = m_pSettingsModel->rowCount();
+
+    // Generate a new profile name based on the current profile count.
+    // Try the number above if the generated name is already taken.
+    BroadcastProfilePtr existingProfile(nullptr);
+    QString newName;
+    do {
+        profileNumber++;
+        newName = tr("Connection %1").arg(profileNumber);
+        existingProfile = m_pSettingsModel->getProfileByName(newName);
+    } while(!existingProfile.isNull());
+
+    BroadcastProfilePtr newProfile(new BroadcastProfile(newName));
+    if(m_pProfileListSelection) {
+        m_pProfileListSelection->copyValuesTo(newProfile);
+    }
+    m_pSettingsModel->addProfileToModel(newProfile);
+    selectConnectionRowByName(newProfile->getProfileName());
+}
+
+void DlgPrefBroadcast::profileListItemSelected(const QModelIndex& selected,
+        const QModelIndex& deselected) {
+    Q_UNUSED(deselected);
+    setValuesToProfile(m_pProfileListSelection);
+
+    QString selectedName = m_pSettingsModel->data(selected,
+            Qt::DisplayRole).toString();
+    BroadcastProfilePtr profile =
+            m_pSettingsModel->getProfileByName(selectedName);
+    if(profile) {
+        getValuesFromProfile(profile);
+        m_pProfileListSelection = profile;
+    }
+}
+
+void DlgPrefBroadcast::updateModel() {
+    // Resetting the model will clear the current list selection
+    // so store the name of the current selection before resetting
+    QString selected("");
+    if(m_pProfileListSelection) {
+        selected = m_pProfileListSelection->getProfileName();
+    }
+
+    m_pSettingsModel->resetFromSettings(m_pBroadcastSettings);
+    if(!selected.isEmpty()) {
+        // Restore previous selection with the name fetched before
+        selectConnectionRowByName(selected);
+    }
+}
+
+void DlgPrefBroadcast::selectConnectionRow(int row) {
+    if(row < 0 || row > m_pSettingsModel->rowCount()) {
+        return;
+    }
+
+    connectionList->selectRow(row);
+}
+
+void DlgPrefBroadcast::selectConnectionRowByName(QString rowName) {
+    int row = -1;
+    for (int i = 0; i < m_pSettingsModel->rowCount(); i++) {
+        QModelIndex index = m_pSettingsModel->index(i, kColumnName);
+        QVariant value = m_pSettingsModel->data(index, Qt::DisplayRole);
+        if (value.toString() == rowName) {
+            row = i;
+            break;
+        }
+    }
+
+    if (row > -1) {
+        selectConnectionRow(row);
+    }
+}
+
+void DlgPrefBroadcast::getValuesFromProfile(BroadcastProfilePtr profile) {
+    if(!profile) {
+        return;
+    }
+
+    // Set groupbox header
+    QString headerText =
+            QString(tr(kSettingsGroupHeader))
+            .arg(profile->getProfileName());
+    groupBoxProfileSettings->setTitle(headerText);
+
+    rbPasswordCleartext->setChecked(!profile->secureCredentialStorage());
+    rbPasswordKeychain->setChecked(profile->secureCredentialStorage());
+
+    // Server type combo list
+    int tmp_index = comboBoxServerType->findData(profile->getServertype());
     if (tmp_index < 0) { // Set default if invalid.
         tmp_index = 0;
     }
     comboBoxServerType->setCurrentIndex(tmp_index);
 
     // Mountpoint
-    mountpoint->setText(m_settings.getMountpoint());
+    mountpoint->setText(profile->getMountpoint());
 
     // Host
-    host->setText(m_settings.getHost());
+    host->setText(profile->getHost());
 
     // Port
-    QString portString = QString::number(m_settings.getPort());
+    QString portString = QString::number(profile->getPort());
     port->setText(portString);
 
     // Login
-    login->setText(m_settings.getLogin());
+    login->setText(profile->getLogin());
 
     // Password
-    password->setText(m_settings.getPassword());
-
+    password->setText(profile->getPassword());
 
     // Enable automatic reconnect
-    bool enableReconnect = m_settings.getEnableReconnect();
+    bool enableReconnect = profile->getEnableReconnect();
     checkBoxEnableReconnect->setChecked(enableReconnect);
     widgetReconnectControls->setEnabled(enableReconnect);
-    connect(checkBoxEnableReconnect, SIGNAL(stateChanged(int)),
-            this, SLOT(checkBoxEnableReconnectChanged(int)));
-
 
     // Wait until first attempt
-    spinBoxFirstDelay->setValue(m_settings.getReconnectFirstDelay());
+    spinBoxFirstDelay->setValue(profile->getReconnectFirstDelay());
 
     // Retry Delay
-    spinBoxReconnectPeriod->setValue(m_settings.getReconnectPeriod());
+    spinBoxReconnectPeriod->setValue(profile->getReconnectPeriod());
 
     // Use Maximum Retries
-    bool limitConnects = m_settings.getLimitReconnects();
+    bool limitConnects = profile->getLimitReconnects();
     checkBoxLimitReconnects->setChecked(
             limitConnects);
     spinBoxMaximumRetries->setEnabled(limitConnects);
-    connect(checkBoxLimitReconnects, SIGNAL(stateChanged(int)),
-            this, SLOT(checkBoxLimitReconnectsChanged(int)));
 
     // Maximum Retries
-    spinBoxMaximumRetries->setValue(m_settings.getMaximumRetries());
-
+    spinBoxMaximumRetries->setValue(profile->getMaximumRetries());
 
     // Stream "public" checkbox
-    stream_public->setChecked(m_settings.getStreamPublic());
+    stream_public->setChecked(profile->getStreamPublic());
 
     // Stream name
-    stream_name->setText(m_settings.getStreamName());
+    stream_name->setText(profile->getStreamName());
 
     // Stream website
-    stream_website->setText(m_settings.getStreamWebsite());
+    stream_website->setText(profile->getStreamWebsite());
 
     // Stream description
-    stream_desc->setText(m_settings.getStreamDesc());
+    stream_desc->setText(profile->getStreamDesc());
 
     // Stream genre
-    stream_genre->setText(m_settings.getStreamGenre());
+    stream_genre->setText(profile->getStreamGenre());
 
     // Encoding bitrate combobox
-    QString kbps_pattern = QString("%1 kbps");
-    QList<int> valid_kpbs;
-    valid_kpbs << BROADCAST_BITRATE_320KBPS
-               << BROADCAST_BITRATE_256KBPS
-               << BROADCAST_BITRATE_224KBPS
-               << BROADCAST_BITRATE_192KBPS
-               << BROADCAST_BITRATE_160KBPS
-               << BROADCAST_BITRATE_128KBPS
-               << BROADCAST_BITRATE_112KBPS
-               << BROADCAST_BITRATE_96KBPS
-               << BROADCAST_BITRATE_80KBPS
-               << BROADCAST_BITRATE_64KBPS
-               << BROADCAST_BITRATE_48KBPS
-               << BROADCAST_BITRATE_32KBPS;
-    foreach (int kbps, valid_kpbs) {
-        comboBoxEncodingBitrate->addItem(
-                kbps_pattern.arg(QString::number(kbps)), kbps);
-    }
-
-    tmp_index = comboBoxEncodingBitrate->findData(m_settings.getBitrate());
+    tmp_index = comboBoxEncodingBitrate->findData(profile->getBitrate());
     if (tmp_index < 0) {
         tmp_index = comboBoxEncodingBitrate->findData(BROADCAST_BITRATE_128KBPS);
     }
     comboBoxEncodingBitrate->setCurrentIndex(tmp_index < 0 ? 0 : tmp_index);
 
     // Encoding format combobox
-    comboBoxEncodingFormat->addItem(tr("MP3"), BROADCAST_FORMAT_MP3);
-    comboBoxEncodingFormat->addItem(tr("Ogg Vorbis"), BROADCAST_FORMAT_OV);
-    tmp_index = comboBoxEncodingFormat->findData(m_settings.getFormat());
+    tmp_index = comboBoxEncodingFormat->findData(profile->getFormat());
     if (tmp_index < 0) {
         // Set default of MP3 if invalid.
         tmp_index = 0;
@@ -127,179 +403,154 @@ DlgPrefBroadcast::DlgPrefBroadcast(QWidget *parent, UserSettingsPointer _config)
     comboBoxEncodingFormat->setCurrentIndex(tmp_index);
 
     // Encoding channels combobox
-    comboBoxEncodingChannels->addItem(tr("Automatic"),
-        static_cast<int>(EncoderSettings::ChannelMode::AUTOMATIC));
-    comboBoxEncodingChannels->addItem(tr("Mono"),
-        static_cast<int>(EncoderSettings::ChannelMode::MONO));
-    comboBoxEncodingChannels->addItem(tr("Stereo"),
-        static_cast<int>(EncoderSettings::ChannelMode::STEREO));
-    tmp_index = comboBoxEncodingChannels->findData(m_settings.getChannels());
+    tmp_index = comboBoxEncodingChannels->findData(profile->getChannels());
     if (tmp_index < 0) { // Set default to automatic if invalid.
         tmp_index = 0;
     }
     comboBoxEncodingChannels->setCurrentIndex(tmp_index);
 
     // Metadata format
-    metadata_format->setText(m_settings.getMetadataFormat());
+    metadata_format->setText(profile->getMetadataFormat());
 
     // Static artist
-    custom_artist->setText(m_settings.getCustomArtist());
+    custom_artist->setText(profile->getCustomArtist());
 
     // Static title
-    custom_title->setText(m_settings.getCustomTitle());
+    custom_title->setText(profile->getCustomTitle());
 
     // "Enable static artist and title" checkbox
-    bool enableMetadata = m_settings.getEnableMetadata();
+    bool enableMetadata = profile->getEnableMetadata();
     enableCustomMetadata->setChecked(enableMetadata);
     custom_artist->setEnabled(enableMetadata);
     custom_title->setEnabled(enableMetadata);
-    connect(enableCustomMetadata, SIGNAL(stateChanged(int)),
-            this, SLOT(enableCustomMetadataChanged(int)));
 
     // "Enable UTF-8 metadata" checkbox
     // TODO(rryan): allow arbitrary codecs in the future?
-    QString charset = m_settings.getMetadataCharset();
+    QString charset = profile->getMetadataCharset();
     enableUtf8Metadata->setChecked(charset == "UTF-8");
 
     // OGG "dynamicupdate" checkbox
-    ogg_dynamicupdate->setChecked(m_settings.getOggDynamicUpdate());
-
-    slotApply();
+    ogg_dynamicupdate->setChecked(profile->getOggDynamicUpdate());
 }
 
-DlgPrefBroadcast::~DlgPrefBroadcast() {
-}
+void DlgPrefBroadcast::setValuesToProfile(BroadcastProfilePtr profile) {
+    if(!profile)
+        return;
 
-void DlgPrefBroadcast::slotResetToDefaults() {
-    // Make sure to keep these values in sync with the constructor.
-    enableLiveBroadcasting->setChecked(false);
-    comboBoxServerType->setCurrentIndex(0);
-    mountpoint->setText(m_settings.getDefaultMountpoint());
-    host->setText(m_settings.getDefaultHost());
-    int iPort = m_settings.getDefaultPort();
-    VERIFY_OR_DEBUG_ASSERT(iPort != 0 && iPort <= 0xffff) {
-        port->setText(QString());
-    } else {
-        port->setText(QString::number(iPort));
-    }
-    login->setText(m_settings.getDefaultLogin());
-    password->setText(m_settings.getDefaultPassword());
-
-    checkBoxEnableReconnect->setChecked(m_settings.getDefaultEnableReconnect());
-    widgetReconnectControls->setEnabled(true);
-    spinBoxFirstDelay->setValue(m_settings.getDefaultReconnectFirstDelay());
-    spinBoxReconnectPeriod->setValue(m_settings.getDefaultReconnectPeriod());
-    checkBoxLimitReconnects->setChecked(m_settings.getDefaultLimitReconnects());
-    spinBoxMaximumRetries->setValue(m_settings.getDefaultMaximumRetries());
-    spinBoxMaximumRetries->setEnabled(true);
-    stream_name->setText(m_settings.getDefaultStreamName());
-    stream_website->setText(m_settings.getDefaultStreamWebsite());
-    stream_desc->setText(m_settings.getDefaultStreamDesc());
-    stream_genre->setText(m_settings.getDefaultStreamGenre());
-    stream_public->setChecked(m_settings.getDefaultStreamPublic());
-    ogg_dynamicupdate->setChecked(m_settings.getDefaultOggDynamicUpdate());
-    comboBoxEncodingBitrate->setCurrentIndex(comboBoxEncodingBitrate->findData(
-            m_settings.getDefaultBitrate()));
-    comboBoxEncodingFormat->setCurrentIndex(0);
-    comboBoxEncodingChannels->setCurrentIndex(0);
-    enableUtf8Metadata->setChecked(false);
-    enableCustomMetadata->setChecked(false);
-    metadata_format->setText(m_settings.getDefaultMetadataFormat());
-    custom_artist->setText(m_settings.getDefaultCustomArtist());
-    custom_title->setText(m_settings.getDefaultCustomTitle());
-    custom_artist->setEnabled(false);
-    custom_title->setEnabled(false);
-}
-
-void DlgPrefBroadcast::slotUpdate() {
-    enableLiveBroadcasting->setChecked(m_pBroadcastEnabled->toBool());
-
-    // Don't let user modify information if
-    // sending is enabled.
-    if(m_pBroadcastEnabled->toBool()) {
-        this->setEnabled(false);
-    } else {
-        this->setEnabled(true);
-    }
-}
-
-void DlgPrefBroadcast::slotApply()
-{
-    m_pBroadcastEnabled->set(enableLiveBroadcasting->isChecked());
-
-    // Don't let user modify information if
-    // sending is enabled.
-    if(m_pBroadcastEnabled->toBool()) {
-        this->setEnabled(false);
-    } else {
-        this->setEnabled(true);
-    }
+    profile->setSecureCredentialStorage(rbPasswordKeychain->isChecked());
 
     // Combo boxes, make sure to load their data not their display strings.
-    m_settings.setServertype(comboBoxServerType->itemData(
+    profile->setServertype(comboBoxServerType->itemData(
             comboBoxServerType->currentIndex()).toString());
-    m_settings.setBitrate(comboBoxEncodingBitrate->itemData(
+    profile->setBitrate(comboBoxEncodingBitrate->itemData(
             comboBoxEncodingBitrate->currentIndex()).toInt());
-    m_settings.setFormat(comboBoxEncodingFormat->itemData(
+    profile->setFormat(comboBoxEncodingFormat->itemData(
             comboBoxEncodingFormat->currentIndex()).toString());
-    m_settings.setChannels(comboBoxEncodingChannels->itemData(
+    profile->setChannels(comboBoxEncodingChannels->itemData(
             comboBoxEncodingChannels->currentIndex()).toInt());
 
     mountpoint->setText(mountpoint->text().trimmed());
-    m_settings.setMountPoint(mountpoint->text());
-    m_settings.setHost(host->text());
-    m_settings.setPort(port->text().toInt());
-    m_settings.setLogin(login->text());
-    m_settings.setPassword(password->text());
-    m_settings.setEnableReconnect(checkBoxEnableReconnect->isChecked());
-    m_settings.setReconnectFirstDelay(spinBoxFirstDelay->value());
-    m_settings.setReconnectPeriod(spinBoxReconnectPeriod->value());
-    m_settings.setLimitReconnects(checkBoxLimitReconnects->isChecked());
-    m_settings.setMaximumRetries(spinBoxMaximumRetries->value());
-    m_settings.setStreamName(stream_name->text());
-    m_settings.setStreamWebsite(stream_website->text());
-    m_settings.setStreamDesc(stream_desc->toPlainText());
-    m_settings.setStreamGenre(stream_genre->text());
-    m_settings.setStreamPublic(stream_public->isChecked());
-    m_settings.setOggDynamicUpdate(ogg_dynamicupdate->isChecked());
+    profile->setMountPoint(mountpoint->text());
+    profile->setHost(host->text());
+    profile->setPort(port->text().toInt());
+    profile->setLogin(login->text());
+    profile->setPassword(password->text());
+    profile->setEnableReconnect(checkBoxEnableReconnect->isChecked());
+    profile->setReconnectFirstDelay(spinBoxFirstDelay->value());
+    profile->setReconnectPeriod(spinBoxReconnectPeriod->value());
+    profile->setLimitReconnects(checkBoxLimitReconnects->isChecked());
+    profile->setMaximumRetries(spinBoxMaximumRetries->value());
+    profile->setStreamName(stream_name->text());
+    profile->setStreamWebsite(stream_website->text());
+    profile->setStreamDesc(stream_desc->toPlainText());
+    profile->setStreamGenre(stream_genre->text());
+    profile->setStreamPublic(stream_public->isChecked());
+    profile->setOggDynamicUpdate(ogg_dynamicupdate->isChecked());
 
     QString charset = "";
     if (enableUtf8Metadata->isChecked()) {
         charset = "UTF-8";
     }
-    QString current_charset = m_settings.getMetadataCharset();
+    QString current_charset = profile->getMetadataCharset();
 
     // Only allow setting the config value if the current value is either empty
     // or "UTF-8". This way users can customize the charset to something else by
     // setting the value in their mixxx.cfg. Not sure if this will be useful but
     // it's good to leave the option open.
     if (current_charset.length() == 0 || current_charset == "UTF-8") {
-        m_settings.setMetadataCharset(charset);
+        profile->setMetadataCharset(charset);
     }
 
-    m_settings.setEnableMetadata(enableCustomMetadata->isChecked());
-    m_settings.setCustomArtist(custom_artist->text());
-    m_settings.setCustomTitle(custom_title->text());
-    m_settings.setMetadataFormat(metadata_format->text());
+    profile->setEnableMetadata(enableCustomMetadata->isChecked());
+    profile->setCustomArtist(custom_artist->text());
+    profile->setCustomTitle(custom_title->text());
+    profile->setMetadataFormat(metadata_format->text());
 }
 
-void DlgPrefBroadcast::broadcastEnabledChanged(double value) {
-    qDebug() << "DlgPrefBroadcast::broadcastEnabledChanged()" << value;
-    bool enabled = value == 1.0; // 0 and 2 are disabled
-    this->setEnabled(!enabled);
-    enableLiveBroadcasting->setChecked(enabled);
+void DlgPrefBroadcast::btnRemoveConnectionClicked() {
+    if(m_pSettingsModel->rowCount() < 2) {
+        QMessageBox::information(this, tr("Action failed"),
+                tr("At least one connection is required."));
+        return;
+    }
+
+    if(m_pProfileListSelection) {
+        QString profileName = m_pProfileListSelection->getProfileName();
+        auto response = QMessageBox::question(this, tr("Confirmation required"),
+                    tr("Are you sure you want to delete '%1'?")
+                    .arg(profileName), QMessageBox::Yes, QMessageBox::No);
 
+        if(response == QMessageBox::Yes) {
+            m_pSettingsModel->deleteProfileFromModel(m_pProfileListSelection);
+        }
+    }
 }
 
-void DlgPrefBroadcast::checkBoxEnableReconnectChanged(int value) {
-    widgetReconnectControls->setEnabled(value);
+void DlgPrefBroadcast::btnRenameConnectionClicked() {
+    if(m_pProfileListSelection) {
+        QString profileName = m_pProfileListSelection->getProfileName();
+
+        bool ok = false;
+        QString newName =
+                QInputDialog::getText(this, tr("Renaming '%1'").arg(profileName),
+                        tr("New name for '%1':").arg(profileName),
+                        QLineEdit::Normal, profileName, &ok);
+        if(ok && newName != profileName) {
+            BroadcastProfilePtr existingProfile = m_pSettingsModel->getProfileByName(newName);
+            if(!existingProfile) {
+                // Requested name not used already
+                m_pProfileListSelection->setProfileName(newName);
+                getValuesFromProfile(m_pProfileListSelection);
+            } else {
+                // Requested name different from current name but already used
+                QMessageBox::warning(this, tr("Action failed"),
+                        tr("Can't rename '%1' to '%2': name already in use")
+                        .arg(profileName).arg(newName));
+            }
+        }
+    }
 }
 
-void DlgPrefBroadcast::checkBoxLimitReconnectsChanged(int value) {
-    spinBoxMaximumRetries->setEnabled(value);
+void DlgPrefBroadcast::btnDisconnectAllClicked() {
+    auto response = QMessageBox::question(this,
+            tr("Confirmation required"),
+            tr("Are you sure you want to disconnect every active Live Broadcasting source connection?"),
+            QMessageBox::Yes, QMessageBox::No);
+
+    if(response == QMessageBox::Yes) {
+        m_pBroadcastEnabled->set(false);
+        broadcastEnabledChanged(0.0);
+    }
 }
 
-void DlgPrefBroadcast::enableCustomMetadataChanged(int value) {
-    custom_artist->setEnabled(value);
-    custom_title->setEnabled(value);
+void DlgPrefBroadcast::onSectionResized() {
+    float width = (float)connectionList->width();
+
+    sender()->blockSignals(true);
+    connectionList->setColumnWidth(kColumnEnabled, 100);
+    connectionList->setColumnWidth(kColumnName, width * 0.65);
+    // The last column is automatically resized to fill
+    // the remaining width, thanks to stretchLastSection set to true.
+    sender()->blockSignals(false);
 }
+
diff --git a/src/preferences/dialog/dlgprefbroadcast.h b/src/preferences/dialog/dlgprefbroadcast.h
index 2f1fc4d2420..490d6aec7e0 100644
--- a/src/preferences/dialog/dlgprefbroadcast.h
+++ b/src/preferences/dialog/dlgprefbroadcast.h
@@ -1,6 +1,7 @@
 #ifndef DLGPREFBROADCAST_H
 #define DLGPREFBROADCAST_H
 
+#include <QModelIndex>
 #include <QWidget>
 
 #include "preferences/dialog/ui_dlgprefbroadcastdlg.h"
@@ -9,13 +10,15 @@
 #include "broadcast/defs_broadcast.h"
 #include "preferences/dlgpreferencepage.h"
 #include "preferences/broadcastsettings.h"
+#include "preferences/broadcastsettingsmodel.h"
 
 class ControlProxy;
 
 class DlgPrefBroadcast : public DlgPreferencePage, public Ui::DlgPrefBroadcastDlg  {
     Q_OBJECT
   public:
-    DlgPrefBroadcast(QWidget *parent, UserSettingsPointer _config);
+    DlgPrefBroadcast(QWidget *parent,
+                     BroadcastSettingsPointer pBroadcastSettings);
     virtual ~DlgPrefBroadcast();
 
   public slots:
@@ -27,13 +30,31 @@ class DlgPrefBroadcast : public DlgPreferencePage, public Ui::DlgPrefBroadcastDl
     void checkBoxEnableReconnectChanged(int value);
     void checkBoxLimitReconnectsChanged(int value);
     void enableCustomMetadataChanged(int value);
+    void profileListItemSelected(const QModelIndex& selected,
+            const QModelIndex& deselected);
 
   signals:
     void apply(const QString &);
 
+  private slots:
+    void btnCreateConnectionClicked();
+    void btnRenameConnectionClicked();
+    void btnRemoveConnectionClicked();
+    void btnDisconnectAllClicked();
+    void onSectionResized();
+
   private:
-    BroadcastSettings m_settings;
+    void applyModel();
+    void updateModel();
+    void selectConnectionRow(int row);
+    void selectConnectionRowByName(QString rowName);
+    void getValuesFromProfile(BroadcastProfilePtr profile);
+    void setValuesToProfile(BroadcastProfilePtr profile);
+
+    BroadcastSettingsPointer m_pBroadcastSettings;
+    BroadcastSettingsModel* m_pSettingsModel;
     ControlProxy* m_pBroadcastEnabled;
+    BroadcastProfilePtr m_pProfileListSelection;
 };
 
 #endif
diff --git a/src/preferences/dialog/dlgprefbroadcastdlg.ui b/src/preferences/dialog/dlgprefbroadcastdlg.ui
index bd663fc00f3..d4c34184dc9 100644
--- a/src/preferences/dialog/dlgprefbroadcastdlg.ui
+++ b/src/preferences/dialog/dlgprefbroadcastdlg.ui
@@ -6,630 +6,830 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>692</width>
-    <height>581</height>
+    <width>731</width>
+    <height>897</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Live Broadcasting Preferences</string>
   </property>
-  <layout class="QGridLayout">
-   <item row="6" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
+  <layout class="QGridLayout" rowstretch="0,0,0,0,0,0,0">
    <item row="0" column="0" colspan="2">
-    <widget class="QCheckBox" name="enableLiveBroadcasting">
-     <property name="text">
-      <string>Enable Live Broadcasting</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBoxServerConnection">
+    <widget class="QGroupBox" name="groupBoxProfiles">
      <property name="title">
-      <string>Server connection</string>
+      <string>Live Broadcasting source connections</string>
      </property>
-     <layout class="QGridLayout">
-      <item row="1" column="0">
-       <layout class="QGridLayout" name="gridLayoutSC">
-        <item row="0" column="0">
-         <widget class="QLabel" name="label">
+     <layout class="QVBoxLayout" name="verticalLayout_7">
+      <item>
+       <widget class="QTableView" name="connectionList">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>130</height>
+         </size>
+        </property>
+        <property name="styleSheet">
+         <string notr="true"/>
+        </property>
+        <property name="selectionMode">
+         <enum>QAbstractItemView::SingleSelection</enum>
+        </property>
+        <property name="selectionBehavior">
+         <enum>QAbstractItemView::SelectRows</enum>
+        </property>
+        <property name="showGrid">
+         <bool>true</bool>
+        </property>
+        <property name="gridStyle">
+         <enum>Qt::NoPen</enum>
+        </property>
+        <attribute name="horizontalHeaderHighlightSections">
+         <bool>true</bool>
+        </attribute>
+        <attribute name="horizontalHeaderStretchLastSection">
+         <bool>true</bool>
+        </attribute>
+        <attribute name="verticalHeaderVisible">
+         <bool>false</bool>
+        </attribute>
+        <attribute name="verticalHeaderHighlightSections">
+         <bool>false</bool>
+        </attribute>
+       </widget>
+      </item>
+      <item>
+       <layout class="QGridLayout" name="gridLayout_4">
+        <item row="1" column="0">
+         <widget class="QPushButton" name="btnRemoveConnection">
           <property name="text">
-           <string>Type</string>
+           <string>Delete selected</string>
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
-         <widget class="QComboBox" name="comboBoxServerType">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
+        <item row="1" column="2">
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
           </property>
-         </widget>
-        </item>
-        <item row="0" column="2">
-         <widget class="QWidget" name="widget" native="true">
-          <property name="minimumSize">
+          <property name="sizeType">
+           <enum>QSizePolicy::Expanding</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
            <size>
-            <width>10</width>
-            <height>0</height>
+            <width>40</width>
+            <height>20</height>
            </size>
           </property>
-         </widget>
-        </item>
-        <item row="0" column="3">
-         <widget class="QLabel" name="label_5">
-          <property name="text">
-           <string>Mount</string>
-          </property>
-         </widget>
+         </spacer>
         </item>
-        <item row="0" column="4">
-         <widget class="QLineEdit" name="mountpoint">
-          <property name="text">
-           <string notr="true"/>
+        <item row="1" column="6">
+         <widget class="QPushButton" name="btnCreateConnection">
+          <property name="styleSheet">
+           <string notr="true">padding: 4px 7px 4px 7px;</string>
           </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_2">
           <property name="text">
-           <string>Host</string>
+           <string>Create new connection</string>
           </property>
          </widget>
         </item>
         <item row="1" column="1">
-         <widget class="QLineEdit" name="host">
+         <widget class="QPushButton" name="btnRenameConnection">
           <property name="text">
-           <string notr="true"/>
+           <string>Rename selected</string>
           </property>
          </widget>
         </item>
         <item row="1" column="3">
-         <widget class="QLabel" name="label_3">
+         <widget class="QPushButton" name="btnDisconnectAll">
           <property name="text">
-           <string>Port</string>
+           <string>Disconnect all</string>
           </property>
          </widget>
         </item>
         <item row="1" column="4">
-         <widget class="QLineEdit" name="port">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string notr="true"/>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_6">
-          <property name="text">
-           <string>Login</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QLineEdit" name="login">
-          <property name="text">
-           <string notr="true">source</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="3">
-         <widget class="QLabel" name="label_7">
-          <property name="text">
-           <string>Password</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="4">
-         <widget class="QLineEdit" name="password">
-          <property name="text">
-           <string notr="true"/>
-          </property>
-          <property name="echoMode">
-           <enum>QLineEdit::Password</enum>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QGroupBox" name="groupBoxEncoding">
-     <property name="title">
-      <string>Encoding</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <item>
-       <layout class="QGridLayout" name="gridLayout_3">
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_8">
-          <property name="text">
-           <string>Format</string>
-          </property>
-          <property name="buddy">
-           <cstring>comboBoxEncodingFormat</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0">
-         <widget class="QLabel" name="label_4">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Bitrate</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_9">
-          <property name="frameShape">
-           <enum>QFrame::NoFrame</enum>
-          </property>
-          <property name="lineWidth">
-           <number>1</number>
-          </property>
-          <property name="text">
-           <string>Channels</string>
-          </property>
-          <property name="textFormat">
-           <enum>Qt::AutoText</enum>
-          </property>
-          <property name="scaledContents">
-           <bool>false</bool>
-          </property>
-          <property name="buddy">
-           <cstring>comboBoxEncodingChannels</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QComboBox" name="comboBoxEncodingChannels">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16777215</width>
-            <height>16777215</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QComboBox" name="comboBoxEncodingFormat">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QComboBox" name="comboBoxEncodingBitrate">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="1">
-         <spacer name="verticalSpacer_2">
+         <spacer name="horizontalSpacer_3">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
-            <width>20</width>
-            <height>40</height>
+            <width>40</width>
+            <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
        </layout>
       </item>
+      <item>
+       <widget class="QCheckBox" name="connectOnApply">
+        <property name="text">
+         <string>Turn on Live Broadcasting when applying these settings</string>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
-   <item row="3" column="0">
-    <widget class="QGroupBox" name="groupBoxStreamInfo">
-     <property name="minimumSize">
+   <item row="6" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
       <size>
-       <width>300</width>
-       <height>0</height>
+       <width>20</width>
+       <height>40</height>
       </size>
      </property>
+    </spacer>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupBoxProfileSettings">
      <property name="title">
-      <string>Stream info</string>
+      <string>Settings for %1</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <layout class="QGridLayout">
-        <item row="1" column="1">
-         <widget class="QLineEdit" name="stream_name">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Mixxx Icecast Testing</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_10">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Stream name</string>
-          </property>
-          <property name="buddy">
-           <cstring>comboBoxServerType</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_11">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Website</string>
-          </property>
-          <property name="buddy">
-           <cstring>mountpoint</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QLineEdit" name="stream_website">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>http://www.mixxx.org</string>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="label_12">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Description</string>
-          </property>
-          <property name="buddy">
-           <cstring>stream_desc</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="1">
-         <widget class="QTextEdit" name="stream_desc">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>50</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16777215</width>
-            <height>50</height>
-           </size>
-          </property>
-          <property name="tabChangesFocus">
-           <bool>true</bool>
-          </property>
-          <property name="html">
-           <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+     <layout class="QGridLayout" name="gridLayout_8">
+      <item row="2" column="0">
+       <widget class="QGroupBox" name="groupBoxAutomaticReconnect">
+        <property name="title">
+         <string>Automatic reconnect</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_3">
+         <item>
+          <layout class="QVBoxLayout" name="verticalLayout_5">
+           <item>
+            <widget class="QCheckBox" name="checkBoxEnableReconnect">
+             <property name="toolTip">
+              <string>Reconnect if the connection to the streaming server is lost.</string>
+             </property>
+             <property name="text">
+              <string>Enable automatic reconnect</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QWidget" name="widgetReconnectControls" native="true">
+             <layout class="QGridLayout" name="gridLayout_5">
+              <property name="leftMargin">
+               <number>0</number>
+              </property>
+              <property name="topMargin">
+               <number>0</number>
+              </property>
+              <property name="rightMargin">
+               <number>0</number>
+              </property>
+              <property name="bottomMargin">
+               <number>0</number>
+              </property>
+              <item row="0" column="0">
+               <layout class="QGridLayout" name="gridLayout_2">
+                <item row="1" column="0">
+                 <widget class="QLabel" name="label_18">
+                  <property name="text">
+                   <string>Reconnect period</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="1">
+                 <widget class="QDoubleSpinBox" name="spinBoxReconnectPeriod">
+                  <property name="toolTip">
+                   <string>Time to wait between two reconnection attempts.</string>
+                  </property>
+                  <property name="suffix">
+                   <string> seconds</string>
+                  </property>
+                  <property name="decimals">
+                   <number>2</number>
+                  </property>
+                  <property name="maximum">
+                   <double>3600.000000000000000</double>
+                  </property>
+                 </widget>
+                </item>
+                <item row="3" column="1">
+                 <widget class="QSpinBox" name="spinBoxMaximumRetries">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="minimum">
+                   <number>1</number>
+                  </property>
+                  <property name="maximum">
+                   <number>100</number>
+                  </property>
+                 </widget>
+                </item>
+                <item row="3" column="0">
+                 <widget class="QLabel" name="label_17">
+                  <property name="text">
+                   <string>Maximum retries</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="2" column="0" colspan="2">
+                 <widget class="QCheckBox" name="checkBoxLimitReconnects">
+                  <property name="toolTip">
+                   <string comment="Uncheck for unlimited reconnect attempts."/>
+                  </property>
+                  <property name="text">
+                   <string>Limit number of reconnection attempts</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="1">
+                 <widget class="QDoubleSpinBox" name="spinBoxFirstDelay">
+                  <property name="toolTip">
+                   <string>Time to wait before the first reconnection attempt is made.</string>
+                  </property>
+                  <property name="suffix">
+                   <string> seconds</string>
+                  </property>
+                  <property name="maximum">
+                   <double>3600.000000000000000</double>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="0">
+                 <widget class="QLabel" name="label_19">
+                  <property name="text">
+                   <string>Wait until first attempt</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QGroupBox" name="groupBoxEncoding">
+        <property name="title">
+         <string>Encoding</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_4">
+         <item>
+          <layout class="QGridLayout" name="gridLayout_3">
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_8">
+             <property name="text">
+              <string>Format</string>
+             </property>
+             <property name="buddy">
+              <cstring>comboBoxEncodingFormat</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_4">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>Bitrate</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0">
+            <widget class="QLabel" name="label_9">
+             <property name="frameShape">
+              <enum>QFrame::NoFrame</enum>
+             </property>
+             <property name="lineWidth">
+              <number>1</number>
+             </property>
+             <property name="text">
+              <string>Channels</string>
+             </property>
+             <property name="textFormat">
+              <enum>Qt::AutoText</enum>
+             </property>
+             <property name="scaledContents">
+              <bool>false</bool>
+             </property>
+             <property name="buddy">
+              <cstring>comboBoxEncodingChannels</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="QComboBox" name="comboBoxEncodingChannels">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>16777215</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QComboBox" name="comboBoxEncodingFormat">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QComboBox" name="comboBoxEncodingBitrate">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="1">
+            <spacer name="verticalSpacer_2">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QGroupBox" name="groupBoxMetadata">
+        <property name="title">
+         <string>Metadata</string>
+        </property>
+        <property name="flat">
+         <bool>false</bool>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout">
+         <item>
+          <layout class="QGridLayout" name="gridLayout">
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_16">
+             <property name="text">
+              <string>Format</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QLineEdit" name="metadata_format">
+             <property name="text">
+              <string notr="true">$artist - $title</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0">
+            <widget class="QLabel" name="label_14">
+             <property name="text">
+              <string>Static artist</string>
+             </property>
+             <property name="buddy">
+              <cstring>custom_artist</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="QLineEdit" name="custom_artist">
+             <property name="text">
+              <string notr="true">%mainartist</string>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="0">
+            <widget class="QLabel" name="label_15">
+             <property name="text">
+              <string>Static title</string>
+             </property>
+             <property name="buddy">
+              <cstring>custom_title</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="1">
+            <widget class="QLineEdit" name="custom_title">
+             <property name="text">
+              <string notr="true">%maintitle</string>
+             </property>
+            </widget>
+           </item>
+           <item row="5" column="0" colspan="2">
+            <widget class="QCheckBox" name="ogg_dynamicupdate">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="toolTip">
+              <string>Due to flaws in some streaming clients, updating Ogg Vorbis metadata dynamically can cause listener glitches and disconnections. Check this box to update the metadata anyway.</string>
+             </property>
+             <property name="text">
+              <string>Dynamically update Ogg Vorbis metadata.</string>
+             </property>
+            </widget>
+           </item>
+           <item row="6" column="0" colspan="2">
+            <widget class="QCheckBox" name="enableUtf8Metadata">
+             <property name="text">
+              <string>Use UTF-8 encoding for metadata.</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0" colspan="2">
+            <widget class="QCheckBox" name="enableCustomMetadata">
+             <property name="text">
+              <string>Use static artist and title.</string>
+             </property>
+             <property name="checked">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QGroupBox" name="groupBoxStreamInfo">
+        <property name="minimumSize">
+         <size>
+          <width>300</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="title">
+         <string>Stream info</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
+          <layout class="QGridLayout">
+           <item row="1" column="1">
+            <widget class="QLineEdit" name="stream_name">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>Mixxx Icecast Testing</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_10">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>Stream name</string>
+             </property>
+             <property name="buddy">
+              <cstring>comboBoxServerType</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0">
+            <widget class="QLabel" name="label_11">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>Website</string>
+             </property>
+             <property name="buddy">
+              <cstring>mountpoint</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="QLineEdit" name="stream_website">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>http://www.mixxx.org</string>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="0">
+            <widget class="QLabel" name="label_12">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>Description</string>
+             </property>
+             <property name="buddy">
+              <cstring>stream_desc</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="1">
+            <widget class="QTextEdit" name="stream_desc">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="minimumSize">
+              <size>
+               <width>0</width>
+               <height>50</height>
+              </size>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>16777215</width>
+               <height>50</height>
+              </size>
+             </property>
+             <property name="tabChangesFocus">
+              <bool>true</bool>
+             </property>
+             <property name="html">
+              <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;  &lt;/p&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;  &lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="label_13">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Genre</string>
-          </property>
-          <property name="buddy">
-           <cstring>stream_genre</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="1">
-         <widget class="QLineEdit" name="stream_genre">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Live mix</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0" colspan="2">
-         <widget class="QCheckBox" name="stream_public">
-          <property name="text">
-           <string>Public stream</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="0">
+            <widget class="QLabel" name="label_13">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>Genre</string>
+             </property>
+             <property name="buddy">
+              <cstring>stream_genre</cstring>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="1">
+            <widget class="QLineEdit" name="stream_genre">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>Live mix</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="0" colspan="2">
+            <widget class="QCheckBox" name="stream_public">
+             <property name="text">
+              <string>Public stream</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
       </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QGroupBox" name="groupBoxMetadata">
-     <property name="title">
-      <string>Metadata</string>
-     </property>
-     <property name="flat">
-      <bool>false</bool>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="0">
-         <widget class="QLabel" name="label_16">
-          <property name="text">
-           <string>Format</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QLineEdit" name="metadata_format">
-          <property name="text">
-           <string notr="true">$artist - $title</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_14">
-          <property name="text">
-           <string>Static artist</string>
-          </property>
-          <property name="buddy">
-           <cstring>custom_artist</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QLineEdit" name="custom_artist">
-          <property name="text">
-           <string notr="true">%mainartist</string>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="label_15">
-          <property name="text">
-           <string>Static title</string>
-          </property>
-          <property name="buddy">
-           <cstring>custom_title</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="1">
-         <widget class="QLineEdit" name="custom_title">
-          <property name="text">
-           <string notr="true">%maintitle</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="0" colspan="2">
-         <widget class="QCheckBox" name="ogg_dynamicupdate">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="toolTip">
-           <string>Due to flaws in some streaming clients, updating Ogg Vorbis metadata dynamically can cause listener glitches and disconnections. Check this box to update the metadata anyway.</string>
-          </property>
-          <property name="text">
-           <string>Dynamically update Ogg Vorbis metadata.</string>
-          </property>
-         </widget>
-        </item>
-        <item row="6" column="0" colspan="2">
-         <widget class="QCheckBox" name="enableUtf8Metadata">
-          <property name="text">
-           <string>Use UTF-8 encoding for metadata.</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0" colspan="2">
-         <widget class="QCheckBox" name="enableCustomMetadata">
-          <property name="text">
-           <string>Use static artist and title.</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
+      <item row="0" column="0" colspan="2">
+       <widget class="QLabel" name="labelHowtoSettings">
+        <property name="text">
+         <string>Select a connection above to edit its settings here</string>
+        </property>
+       </widget>
       </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QGroupBox" name="groupBoxAutomaticReconnect">
-     <property name="title">
-      <string>Automatic reconnect</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_5">
-        <item>
-         <widget class="QCheckBox" name="checkBoxEnableReconnect">
-          <property name="toolTip">
-           <string>Reconnect if the connection to the streaming server is lost.</string>
-          </property>
-          <property name="text">
-           <string>Enable automatic reconnect</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QWidget" name="widgetReconnectControls" native="true">
-          <layout class="QGridLayout" name="gridLayout_5">
-           <property name="margin">
-            <number>0</number>
-           </property>
+      <item row="1" column="0" colspan="2">
+       <widget class="QGroupBox" name="groupBoxServerConnection">
+        <property name="title">
+         <string>Server connection</string>
+        </property>
+        <layout class="QGridLayout">
+         <item row="0" column="0">
+          <layout class="QGridLayout" name="gridLayoutSC">
            <item row="0" column="0">
-            <layout class="QGridLayout" name="gridLayout_2">
-             <item row="1" column="0">
-              <widget class="QLabel" name="label_18">
-               <property name="text">
-                <string>Reconnect period</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QDoubleSpinBox" name="spinBoxReconnectPeriod">
-               <property name="toolTip">
-                <string>Time to wait between two reconnection attempts.</string>
-               </property>
-               <property name="suffix">
-                <string> seconds</string>
-               </property>
-               <property name="decimals">
-                <number>2</number>
-               </property>
-               <property name="maximum">
-                <double>3600.000000000000000</double>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="1">
-              <widget class="QSpinBox" name="spinBoxMaximumRetries">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimum">
-                <number>1</number>
-               </property>
-               <property name="maximum">
-                <number>100</number>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="0">
-              <widget class="QLabel" name="label_17">
-               <property name="text">
-                <string>Maximum retries</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="0" colspan="2">
-              <widget class="QCheckBox" name="checkBoxLimitReconnects">
-               <property name="toolTip">
-                <string comment="Uncheck for unlimited reconnect attempts."/>
-               </property>
-               <property name="text">
-                <string>Limit number of reconnection attempts</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QDoubleSpinBox" name="spinBoxFirstDelay">
-               <property name="toolTip">
-                <string>Time to wait before the first reconnection attempt is made.</string>
-               </property>
-               <property name="suffix">
-                <string> seconds</string>
-               </property>
-               <property name="maximum">
-                <double>3600.000000000000000</double>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0">
-              <widget class="QLabel" name="label_19">
-               <property name="text">
-                <string>Wait until first attempt</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
+            <widget class="QLabel" name="label">
+             <property name="text">
+              <string>Type</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QComboBox" name="comboBoxServerType">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="2">
+            <widget class="QWidget" name="widget" native="true">
+             <property name="minimumSize">
+              <size>
+               <width>10</width>
+               <height>0</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="3">
+            <widget class="QLabel" name="label_5">
+             <property name="text">
+              <string>Mount</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="4">
+            <widget class="QLineEdit" name="mountpoint">
+             <property name="text">
+              <string notr="true"/>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_2">
+             <property name="text">
+              <string>Host</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QLineEdit" name="host">
+             <property name="text">
+              <string notr="true"/>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="3">
+            <widget class="QLabel" name="label_3">
+             <property name="text">
+              <string>Port</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="4">
+            <widget class="QLineEdit" name="port">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string notr="true"/>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0">
+            <widget class="QLabel" name="label_6">
+             <property name="text">
+              <string>Login</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="QLineEdit" name="login">
+             <property name="text">
+              <string notr="true">source</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="3">
+            <widget class="QLabel" name="label_7">
+             <property name="text">
+              <string>Password</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="4">
+            <widget class="QLineEdit" name="password">
+             <property name="text">
+              <string notr="true"/>
+             </property>
+             <property name="echoMode">
+              <enum>QLineEdit::Password</enum>
+             </property>
+            </widget>
            </item>
           </layout>
-         </widget>
-        </item>
-       </layout>
+         </item>
+         <item row="1" column="0">
+          <widget class="QWidget" name="groupPasswordStorage" native="true">
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout">
+              <item>
+               <widget class="QLabel" name="label_20">
+                <property name="text">
+                 <string>Password storage</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QRadioButton" name="rbPasswordCleartext">
+                <property name="text">
+                 <string>Plain text</string>
+                </property>
+                <attribute name="buttonGroup">
+                 <string notr="true">rbGroupPassword</string>
+                </attribute>
+               </widget>
+              </item>
+              <item>
+               <widget class="QRadioButton" name="rbPasswordKeychain">
+                <property name="text">
+                 <string>Secure storage (OS keychain)</string>
+                </property>
+                <attribute name="buttonGroup">
+                 <string notr="true">rbGroupPassword</string>
+                </attribute>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_2">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </widget>
       </item>
      </layout>
     </widget>
@@ -639,4 +839,7 @@ p, li { white-space: pre-wrap; }
  <layoutdefault spacing="6" margin="11"/>
  <resources/>
  <connections/>
+ <buttongroups>
+  <buttongroup name="rbGroupPassword"/>
+ </buttongroups>
 </ui>
diff --git a/src/preferences/dialog/dlgpreferences.cpp b/src/preferences/dialog/dlgpreferences.cpp
index 773fa46b419..4f6ff1cf19e 100644
--- a/src/preferences/dialog/dlgpreferences.cpp
+++ b/src/preferences/dialog/dlgpreferences.cpp
@@ -62,8 +62,9 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader,
                                SoundManager * soundman, PlayerManager* pPlayerManager,
                                ControllerManager * controllers, VinylControlManager *pVCManager,
                                EffectsManager* pEffectsManager,
-                               UserSettingsPointer pConfig, Library *pLibrary)
-        : m_pConfig(pConfig),
+                               SettingsManager* pSettingsManager,
+                               Library *pLibrary)
+        : m_pConfig(pSettingsManager->settings()),
           m_pageSizeHint(QSize(0, 0)),
           m_preferencesUpdated(ConfigKey("[Preferences]", "updated"), false) {
     setupUi(this);
@@ -124,7 +125,8 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader,
     m_wrecord = new DlgPrefRecord(this, m_pConfig);
     addPageWidget(m_wrecord);
 #ifdef __BROADCAST__
-    m_wbroadcast = new DlgPrefBroadcast(this, m_pConfig);
+    m_wbroadcast = new DlgPrefBroadcast(this,
+            pSettingsManager->broadcastSettings());
     addPageWidget(m_wbroadcast);
 #endif
 #ifdef __MODPLUG__
diff --git a/src/preferences/dialog/dlgpreferences.h b/src/preferences/dialog/dlgpreferences.h
index f6ddd4303ec..5b9c0097440 100644
--- a/src/preferences/dialog/dlgpreferences.h
+++ b/src/preferences/dialog/dlgpreferences.h
@@ -27,6 +27,7 @@
 #include "preferences/usersettings.h"
 #include "control/controlpushbutton.h"
 #include "preferences/dlgpreferencepage.h"
+#include "preferences/settingsmanager.h"
 
 class MixxxMainWindow;
 class SoundManager;
@@ -63,7 +64,7 @@ class DlgPreferences : public QDialog, public Ui::DlgPreferencesDlg {
     DlgPreferences(MixxxMainWindow* mixxx, SkinLoader* pSkinLoader, SoundManager* soundman,
                    PlayerManager* pPlayerManager, ControllerManager* controllers,
                    VinylControlManager* pVCManager, EffectsManager* pEffectsManager,
-                   UserSettingsPointer pConfig, Library *pLibrary);
+                   SettingsManager* pSettingsManager, Library *pLibrary);
     virtual ~DlgPreferences();
 
     void addPageWidget(DlgPreferencePage* pWidget);
diff --git a/src/preferences/settingsmanager.cpp b/src/preferences/settingsmanager.cpp
index bd5d2188bbc..c5b531ed332 100644
--- a/src/preferences/settingsmanager.cpp
+++ b/src/preferences/settingsmanager.cpp
@@ -28,6 +28,11 @@ SettingsManager::SettingsManager(QObject* pParent,
     initializeDefaults();
 
     ControlDoublePrivate::setUserConfig(m_pSettings);
+
+    VERIFY_OR_DEBUG_ASSERT(!m_pBroadcastSettings.isNull()) {
+        m_pBroadcastSettings = BroadcastSettingsPointer(
+                                   new BroadcastSettings(m_pSettings));
+    }
 }
 
 SettingsManager::~SettingsManager() {
diff --git a/src/preferences/settingsmanager.h b/src/preferences/settingsmanager.h
index 79880fdc5dd..d45ba67754c 100644
--- a/src/preferences/settingsmanager.h
+++ b/src/preferences/settingsmanager.h
@@ -2,8 +2,10 @@
 #define PREFERENCES_SETTINGSMANAGER_H
 
 #include <QObject>
+#include <QSharedPointer>
 #include <QString>
 
+#include "preferences/broadcastsettings.h"
 #include "preferences/usersettings.h"
 
 class SettingsManager : public QObject {
@@ -16,6 +18,10 @@ class SettingsManager : public QObject {
         return m_pSettings;
     }
 
+    BroadcastSettingsPointer broadcastSettings() const {
+        return m_pBroadcastSettings;
+    }
+
     void save() {
         m_pSettings->save();
     }
@@ -29,7 +35,7 @@ class SettingsManager : public QObject {
 
     UserSettingsPointer m_pSettings;
     bool m_bShouldRescanLibrary;
+    BroadcastSettingsPointer m_pBroadcastSettings;
 };
 
-
 #endif /* PREFERENCES_SETTINGSMANAGER_H */
diff --git a/src/soundio/sounddevicenetwork.cpp b/src/soundio/sounddevicenetwork.cpp
index 7da7338558a..c968db82540 100644
--- a/src/soundio/sounddevicenetwork.cpp
+++ b/src/soundio/sounddevicenetwork.cpp
@@ -13,8 +13,26 @@
 #include "soundio/sounddevice.h"
 #include "soundio/soundmanager.h"
 #include "soundio/soundmanagerutil.h"
+#include "util/logger.h"
 #include "util/sample.h"
 
+namespace {
+const int kNetworkLatencyFrames = 8192; // 185 ms @ 44100 Hz
+// Related chunk sizes:
+// Mp3 frames = 1152 samples
+// Ogg frames = 64 to 8192 samples.
+// In Mixxx 1.11 we transmit every decoder-frames at once,
+// Which results in case of ogg in a dynamic latency from 0.14 ms to to 185 ms
+// Now we have switched to a fixed latency of 8192 frames (stereo samples) =
+// which is 185 @ 44100 ms and twice the maximum of the max mixxx audio buffer
+const int kBufferFrames = kNetworkLatencyFrames * 4; // 743 ms @ 44100 Hz
+// normally * 2 is sufficient.
+// We allow to buffer two extra chunks for a CPU overload case, when
+// the broadcast thread is not scheduled in time.
+
+const mixxx::Logger kLogger("SoundDeviceNetwork");
+}
+
 SoundDeviceNetwork::SoundDeviceNetwork(UserSettingsPointer config,
                                        SoundManager *sm,
                                        QSharedPointer<EngineNetworkStream> pNetworkStream)
@@ -43,14 +61,13 @@ SoundDeviceNetwork::~SoundDeviceNetwork() {
 
 SoundDeviceError SoundDeviceNetwork::open(bool isClkRefDevice, int syncBuffers) {
     Q_UNUSED(syncBuffers);
-    qDebug() << "SoundDeviceNetwork::open()" << getInternalName();
+    kLogger.debug() << "open:" << getInternalName();
 
     // Sample rate
     if (m_dSampleRate <= 0) {
         m_dSampleRate = 44100.0;
     }
 
-    // Get latency in milleseconds
     qDebug() << "framesPerBuffer:" << m_framesPerBuffer;
 
     m_audioBufferTime = mixxx::Duration::fromSeconds(
@@ -99,7 +116,7 @@ bool SoundDeviceNetwork::isOpen() const {
 }
 
 SoundDeviceError SoundDeviceNetwork::close() {
-    //qDebug() << "SoundDeviceNetwork::close()" << getInternalName();
+    //kLogger.debug() << "close:" << getInternalName();
     m_pNetworkStream->stopStream();
     if (m_pThread) {
         m_pThread->stop();
@@ -147,8 +164,8 @@ void SoundDeviceNetwork::readProcess() {
             // we are not able to consume all frames
             if (m_inputDrift) {
                 // Skip one frame
-                //qDebug() << "SoundDevicePortAudio::readProcess() skip one frame"
-                //        << (float)writeAvailable / inChunkSize << (float)readAvailable / inChunkSize;
+                //kLogger.debug() << "readProcess() skip one frame"
+                //                << (float)writeAvailable / inChunkSize << (float)readAvailable / inChunkSize;
                 m_pNetworkStream->read(dataPtr1, 1);
             } else {
                 m_inputDrift = true;
@@ -157,8 +174,8 @@ void SoundDeviceNetwork::readProcess() {
             // We should read at least inChunkSize
             if (m_inputDrift) {
                 // duplicate one frame
-                //qDebug() << "SoundDevicePortAudio::readProcess() duplicate one frame"
-                //        << (float)writeAvailable / inChunkSize << (float)readAvailable / inChunkSize;
+                //kLogger.debug() << "readProcess() duplicate one frame"
+                //                << (float)writeAvailable / inChunkSize << (float)readAvailable / inChunkSize;
                 (void) m_inputFifo->aquireWriteRegions(
                         m_iNumInputChannels, &dataPtr1, &size1,
                         &dataPtr2, &size2);
@@ -239,58 +256,156 @@ void SoundDeviceNetwork::writeProcess() {
         }
         m_outputFifo->releaseWriteRegions(writeCount);
     }
-    writeAvailable = m_pNetworkStream->getWriteExpected()
-            * m_iNumOutputChannels;
+
     int readAvailable = m_outputFifo->readAvailable();
+
+    CSAMPLE* dataPtr1;
+    ring_buffer_size_t size1;
+    CSAMPLE* dataPtr2;
+    ring_buffer_size_t size2;
+    // Try to read as most frames as possible.
+    // NetworkStreamWorker::processWrite takes care of
+    // keeping every output worker in sync
+    m_outputFifo->aquireReadRegions(readAvailable,
+            &dataPtr1, &size1, &dataPtr2, &size2);
+
+    QVector<NetworkOutputStreamWorkerPtr> workers =
+            m_pNetworkStream->outputWorkers();
+    for(auto pWorker : workers) {
+        if(pWorker.isNull()) {
+            continue;
+        }
+
+        workerWriteProcess(pWorker,
+                outChunkSize, readAvailable,
+                dataPtr1, size1,
+                dataPtr2, size2);
+    }
+
+    m_outputFifo->releaseReadRegions(readAvailable);
+}
+
+void SoundDeviceNetwork::workerWriteProcess(NetworkOutputStreamWorkerPtr pWorker,
+        int outChunkSize, int readAvailable,
+        CSAMPLE* dataPtr1, ring_buffer_size_t size1,
+        CSAMPLE* dataPtr2, ring_buffer_size_t size2) {
+    int writeExpected = static_cast<int>(pWorker->getStreamTimeFrames() - pWorker->framesWritten());
+
+    int writeAvailable = writeExpected * m_iNumOutputChannels;
     int copyCount = qMin(readAvailable, writeAvailable);
-    //qDebug() << "SoundDevicePortAudio::writeProcess()" << readAvailable << writeAvailable;
+
     if (copyCount > 0) {
-        CSAMPLE* dataPtr1;
-        ring_buffer_size_t size1;
-        CSAMPLE* dataPtr2;
-        ring_buffer_size_t size2;
-        m_outputFifo->aquireReadRegions(copyCount,
-                &dataPtr1, &size1, &dataPtr2, &size2);
         if (writeAvailable - copyCount > outChunkSize) {
             // Underflow
-            //qDebug() << "SoundDeviceNetwork::writeProcess() Buffer empty";
-            // catch up by filling buffer until we are a half buffer behind
-            m_pNetworkStream->writeSilence(writeAvailable - copyCount - outChunkSize / 2);
+            //kLogger.debug() << "workerWriteProcess: buffer empty";
+            // catch up by filling buffer until we are synced
+            workerWriteSilence(pWorker, writeAvailable - copyCount);
             m_pSoundManager->underflowHappened(24);
         } else if (writeAvailable - copyCount > outChunkSize / 2) {
-            // try to keep network buffer filled up to 0.5 chunks
-            if (m_outputDrift) {
+            // try to keep PAs buffer filled up to 0.5 chunks
+            if (pWorker->outputDrift()) {
                 // duplicate one frame
-                //qDebug() << "SoundDeviceNetwork::writeProcess() duplicate one frame"
-                //         << (float)writeAvailable / outChunkSize << (float)readAvailable / outChunkSize;
-                m_pNetworkStream->write(dataPtr1, 1);
+                //kLogger.debug() << "workerWriteProcess() duplicate one frame"
+                //                << (float)writeAvailable / outChunkSize << (float)readAvailable / outChunkSize;
+                workerWrite(pWorker, dataPtr1, 1);
             } else {
-                m_outputDrift = true;
+                pWorker->setOutputDrift(true);
             }
         } else if (writeAvailable < outChunkSize / 2 ||
                 readAvailable > outChunkSize * 1.5
            ) {
             // We are not able to store at least the half of the new frames
             // or we have a risk of an m_outputFifo overflow
-            if (m_outputDrift) {
-                //qDebug() << "SoundDeviceNetwork::writeProcess() skip one frame"
-                //         << (float)writeAvailable / outChunkSize << (float)readAvailable / outChunkSize;
-            	copyCount = qMin(readAvailable, copyCount + m_iNumOutputChannels);
+            if (pWorker->outputDrift()) {
+                //kLogger.debug() << "SoundDeviceNetwork::workerWriteProcess() skip one frame"
+                //                << (float)writeAvailable / outChunkSize << (float)readAvailable / outChunkSize;
+                copyCount = qMin(readAvailable, copyCount + m_iNumOutputChannels);
             } else {
-                m_outputDrift = true;
+                pWorker->setOutputDrift(true);
             }
         } else {
-            m_outputDrift = false;
+            pWorker->setOutputDrift(false);
         }
 
-        m_pNetworkStream->write(dataPtr1,
-                size1 / m_iNumOutputChannels);
+        workerWrite(pWorker, dataPtr1, size1 / m_iNumOutputChannels);
         if (size2 > 0) {
-            m_pNetworkStream->write(dataPtr2,
-                    size2 / m_iNumOutputChannels);
+            workerWrite(pWorker, dataPtr2, size2 / m_iNumOutputChannels);
+        }
+
+        QSharedPointer<FIFO<CSAMPLE>> pFifo = pWorker->getOutputFifo();
+        if(pFifo) {
+            // interval = copyCount
+            // Check for desired kNetworkLatencyFrames + 1/2 interval to
+            // avoid big jitter due to interferences with sync code
+            if (pFifo->readAvailable() + copyCount / 2
+                    >= (m_iNumOutputChannels * kNetworkLatencyFrames)) {
+                pWorker->outputAvailable();
+            }
+        }
+    }
+}
+
+void SoundDeviceNetwork::workerWrite(NetworkOutputStreamWorkerPtr pWorker,
+        const CSAMPLE* buffer, int frames) {
+    if (!pWorker->threadWaiting()) {
+        pWorker->addFramesWritten(frames);
+        return;
+    }
+
+    QSharedPointer<FIFO<CSAMPLE>> pFifo = pWorker->getOutputFifo();
+    if (pFifo) {
+        int writeAvailable = pFifo->writeAvailable();
+        int writeRequired = frames * m_iNumOutputChannels;
+        if (writeAvailable < writeRequired) {
+            kLogger.warning() << "write: worker buffer full, loosing samples";
+            pWorker->incOverflowCount();
+        }
+
+        int copyCount = math_min(writeAvailable, writeRequired);
+        if (copyCount > 0) {
+            (void)pFifo->write(buffer, copyCount);
+            // we advance the frame only by the samples we have actually copied
+            // This means in case of buffer full (where we loose some frames)
+            // we do not get out of sync, and the syncing code tries to catch up the
+            // stream by writing silence, once the buffer is free.
+            pWorker->addFramesWritten(copyCount / m_iNumOutputChannels);
+        }
+    }
+}
+
+void SoundDeviceNetwork::workerWriteSilence(NetworkOutputStreamWorkerPtr pWorker, int frames) {
+    if (!pWorker->threadWaiting()) {
+        pWorker->addFramesWritten(frames);
+        return;
+    }
+
+    QSharedPointer<FIFO<CSAMPLE>> pFifo = pWorker->getOutputFifo();
+    if(pFifo) {
+        int writeAvailable = pFifo->writeAvailable();
+        int writeRequired = frames * m_iNumOutputChannels;
+        if (writeAvailable < writeRequired) {
+            kLogger.warning() << "writeSilence: worker buffer full, loosing samples";
+            pWorker->incOverflowCount();
+        }
+
+        int clearCount = math_min(writeAvailable, writeRequired);
+        if (clearCount > 0) {
+            CSAMPLE* dataPtr1;
+            ring_buffer_size_t size1;
+            CSAMPLE* dataPtr2;
+            ring_buffer_size_t size2;
+
+            (void)pFifo->aquireWriteRegions(clearCount,
+                    &dataPtr1, &size1, &dataPtr2, &size2);
+            SampleUtil::clear(dataPtr1, size1);
+            if (size2 > 0) {
+                SampleUtil::clear(dataPtr2, size2);
+            }
+            pFifo->releaseWriteRegions(clearCount);
+
+            // we advance the frame only by the samples we have actually cleared
+            pWorker->addFramesWritten(clearCount / m_iNumOutputChannels);
         }
-        m_outputFifo->releaseReadRegions(copyCount);
-        m_pNetworkStream->writingDone(copyCount);
     }
 }
 
@@ -351,7 +466,7 @@ void SoundDeviceNetwork::callbackProcessClkRef() {
 
 void SoundDeviceNetwork::updateCallbackEntryToDacTime() {
     m_clkRefTimer.start();
-    qint64 currentTime = m_pNetworkStream->getStreamTimeUs();
+    qint64 currentTime = m_pNetworkStream->getInputStreamTimeUs();
     m_targetTime += m_audioBufferTime.toIntegerMicros();
     double callbackEntrytoDacSecs = (m_targetTime - currentTime) / 1000000.0;
     callbackEntrytoDacSecs = math_max(callbackEntrytoDacSecs, 0.0001);
@@ -371,7 +486,7 @@ void SoundDeviceNetwork::updateAudioLatencyUsage() {
         //qDebug() << m_pMasterAudioLatencyUsage->get();
     }
 
-    qint64 currentTime = m_pNetworkStream->getStreamTimeUs();
+    qint64 currentTime = m_pNetworkStream->getInputStreamTimeUs();
     unsigned long sleepUs = 0;
     if (currentTime > m_targetTime) {
         m_pSoundManager->underflowHappened(22);
diff --git a/src/soundio/sounddevicenetwork.h b/src/soundio/sounddevicenetwork.h
index 7c53bb1c4f0..ccd840e0ab9 100644
--- a/src/soundio/sounddevicenetwork.h
+++ b/src/soundio/sounddevicenetwork.h
@@ -2,6 +2,7 @@
 #define SOUNDDEVICENETWORK_H
 
 #include <QString>
+#include <QSharedPointer>
 #include <QThread>
 
 #include "util/performancetimer.h"
@@ -41,6 +42,14 @@ class SoundDeviceNetwork : public SoundDevice {
     void updateCallbackEntryToDacTime();
     void updateAudioLatencyUsage();
 
+    void workerWriteProcess(NetworkOutputStreamWorkerPtr pWorker,
+            int outChunkSize, int readAvailable,
+            CSAMPLE* dataPtr1, ring_buffer_size_t size1,
+            CSAMPLE* dataPtr2, ring_buffer_size_t size2);
+    void workerWrite(NetworkOutputStreamWorkerPtr pWorker,
+            const CSAMPLE* buffer, int frames);
+    void workerWriteSilence(NetworkOutputStreamWorkerPtr pWorker, int frames);
+
     QSharedPointer<EngineNetworkStream> m_pNetworkStream;
     std::unique_ptr<FIFO<CSAMPLE> > m_outputFifo;
     std::unique_ptr<FIFO<CSAMPLE> > m_inputFifo;
diff --git a/src/soundio/soundmanager.h b/src/soundio/soundmanager.h
index 01a5d1796bd..ec7a5237a33 100644
--- a/src/soundio/soundmanager.h
+++ b/src/soundio/soundmanager.h
@@ -23,6 +23,7 @@
 #include <QString>
 #include <QList>
 #include <QHash>
+#include <QSharedPointer>
 
 #include "preferences/usersettings.h"
 #include "engine/sidechain/enginenetworkstream.h"
diff --git a/src/test/broadcastprofile_test.cpp b/src/test/broadcastprofile_test.cpp
new file mode 100644
index 00000000000..a2a87a7a7f2
--- /dev/null
+++ b/src/test/broadcastprofile_test.cpp
@@ -0,0 +1,199 @@
+#include <QFile>
+#include <QString>
+
+#include "test/mixxxtest.h"
+#include "preferences/broadcastprofile.h"
+#include "broadcast/defs_broadcast.h"
+#include "defs_urls.h"
+
+namespace {
+
+TEST(BroadcastProfileTest, ConstructWithName) {
+    // instanciate BroadcastProfile with a specific name and
+    // assert its case-sensitive equality when getting it from getProfileName
+    QString name("unit testing profile");
+    BroadcastProfile profile(name);
+    ASSERT_TRUE(profile.getProfileName() == name);
+}
+
+TEST(BroadcastProfileTest, ForbiddenChars) {
+    // Test if validName works properly with valid values
+    ASSERT_TRUE(BroadcastProfile::validName("Default Profile"));
+    ASSERT_TRUE(BroadcastProfile::validName("This is a profile"));
+    ASSERT_TRUE(BroadcastProfile::validName("Radio1 - MP3 128k"));
+    ASSERT_TRUE(BroadcastProfile::validName("Radio1 - AACplus 96k"));
+
+    // Test if validName works properly with invalid values
+    ASSERT_FALSE(BroadcastProfile::validName("Radio1 / MP3 128k"));
+    ASSERT_FALSE(BroadcastProfile::validName("Radio1 \\ AAC+ 96k"));
+    ASSERT_FALSE(BroadcastProfile::validName("Radio1 | OGG 96k"));
+    ASSERT_FALSE(BroadcastProfile::validName("Hello ?"));
+    ASSERT_FALSE(BroadcastProfile::validName("3 * 3"));
+    ASSERT_FALSE(BroadcastProfile::validName("Here it is: a profile"));
+    ASSERT_FALSE(BroadcastProfile::validName("<marquee>Scrolltext<marquee/>"));
+    ASSERT_FALSE(BroadcastProfile::validName("It's called a \"profile\"."));
+
+    // Test if forbidden chars are properly stripped
+    ASSERT_FALSE(BroadcastProfile::stripForbiddenChars(
+                        "This is an invalid profile name: ?/").contains("?"));
+}
+
+TEST(BroadcastProfileTest, SaveAndLoadXML) {
+    // Preliminary: set a discriminating value in one of the profile fields
+    QString streamName("unit testing in progress");
+
+    BroadcastProfile profile("Unit Testing Profile");
+    profile.setStreamName(streamName);
+
+    QString filename = profile.getProfileName() + QString(".bcp.xml");
+
+    // Call save() on a profile and assert it actually exists
+    QFile::remove(filename); // First, make sure it doesn't exists
+    profile.save(filename);
+    ASSERT_TRUE(QFile::exists(filename));
+
+    // Load XML file using static loadFromFile and assert
+    // the discriminating value is present
+    BroadcastProfilePtr savedProfile = BroadcastProfile::loadFromFile(filename);
+    ASSERT_NE(savedProfile, nullptr);
+    ASSERT_TRUE(savedProfile->getStreamName() == streamName);
+}
+
+TEST(BroadcastProfileTest, SetGetValues) {
+    // For each attribute:
+    // - use its setter to set a specific value
+    // - use its getter to check if the specific value has been set
+
+    BroadcastProfile profile("Get and set values Test");
+
+    // Long method ahead!
+    QString profileName("new name");
+    profile.setProfileName(profileName);
+    ASSERT_TRUE(profile.getProfileName() == profileName);
+
+    bool secureCredentials = true;
+    profile.setSecureCredentialStorage(secureCredentials);
+    ASSERT_EQ(profile.secureCredentialStorage(), secureCredentials);
+
+    bool enabled = false;
+    profile.setEnabled(enabled);
+    ASSERT_EQ(profile.getEnabled(), enabled);
+
+    QString hostname("streaming.website.com");
+    profile.setHost(hostname);
+    ASSERT_TRUE(profile.getHost() == hostname);
+
+    int port = 1238;
+    profile.setPort(port);
+    ASSERT_EQ(profile.getPort(), port);
+
+    QString servertype("Shoutcast 1");
+    profile.setServertype(servertype);
+    ASSERT_TRUE(profile.getServertype() == servertype);
+
+    QString login("myusername");
+    profile.setLogin(login);
+    ASSERT_TRUE(profile.getLogin() == login);
+
+    QString password("changemepassword");
+    profile.setPassword(password);
+    ASSERT_TRUE(profile.getPassword() == password);
+
+    bool enableReconnect = false;
+    profile.setEnableReconnect(enableReconnect);
+    ASSERT_EQ(profile.getEnableReconnect(), enableReconnect);
+
+    double reconnectPeriod = 3.14;
+    profile.setReconnectPeriod(reconnectPeriod);
+    ASSERT_EQ(profile.getReconnectPeriod(), reconnectPeriod);
+
+    bool limitReconnects = false;
+    profile.setLimitReconnects(limitReconnects);
+    ASSERT_EQ(profile.getLimitReconnects(), limitReconnects);
+
+    int maximumRetries = 3;
+    profile.setMaximumRetries(maximumRetries);
+    ASSERT_EQ(profile.getMaximumRetries(), maximumRetries);
+
+    bool noDelayFirstReconnect = false;
+    profile.setNoDelayFirstReconnect(noDelayFirstReconnect);
+    ASSERT_EQ(profile.getNoDelayFirstReconnect(), noDelayFirstReconnect);
+
+    double reconnectFirstDelay = 6.28;
+    profile.setReconnectFirstDelay(reconnectFirstDelay);
+    ASSERT_EQ(profile.getReconnectFirstDelay(), reconnectFirstDelay);
+
+    QString format("Ogg Vorbis");
+    profile.setFormat(format);
+    ASSERT_TRUE(profile.getFormat() == format);
+
+    int bitrate = 320;
+    profile.setBitrate(bitrate);
+    ASSERT_EQ(profile.getBitrate(), bitrate);
+
+    int channels = 1;
+    profile.setChannels(channels);
+    ASSERT_EQ(profile.getChannels(), channels);
+
+    QString mountpoint("stream.ogg");
+    profile.setMountPoint(mountpoint);
+    ASSERT_TRUE(profile.getMountpoint() == mountpoint);
+
+    QString streamName("This is a test stream");
+    profile.setStreamName(streamName);
+    ASSERT_TRUE(profile.getStreamName() == streamName);
+
+    QString streamDesc("this is a stream description");
+    profile.setStreamDesc(streamDesc);
+    ASSERT_TRUE(profile.getStreamDesc() == streamDesc);
+
+    QString streamGenre("unit testing");
+    profile.setStreamGenre(streamGenre);
+    ASSERT_TRUE(profile.getStreamGenre() == streamGenre);
+
+    bool streamPublic = true;
+    profile.setStreamPublic(streamPublic);
+    ASSERT_EQ(profile.getStreamPublic(), streamPublic);
+
+    QString streamWebsite("www.website.com");
+    profile.setStreamWebsite(streamWebsite);
+    ASSERT_TRUE(profile.getStreamWebsite() == streamWebsite);
+
+    bool enableMetadata = true;
+    profile.setEnableMetadata(enableMetadata);
+    ASSERT_EQ(profile.getEnableMetadata(), enableMetadata);
+
+    QString metadataCharset("UTF-8");
+    profile.setMetadataCharset(metadataCharset);
+    ASSERT_TRUE(profile.getMetadataCharset() == metadataCharset);
+
+    QString customArtist("this is an artist");
+    profile.setCustomArtist(customArtist);
+    ASSERT_TRUE(profile.getCustomArtist() == customArtist);
+
+    QString customTitle("this is a title");
+    profile.setCustomTitle(customTitle);
+    ASSERT_TRUE(profile.getCustomTitle() == customTitle);
+
+    QString metadataFormat("no particular format");
+    profile.setMetadataFormat(metadataFormat);
+    ASSERT_TRUE(profile.getMetadataFormat() == metadataFormat);
+
+    bool oggDynamicUpdate = true;
+    profile.setOggDynamicUpdate(oggDynamicUpdate);
+    ASSERT_EQ(profile.getOggDynamicUpdate(), oggDynamicUpdate);
+}
+
+TEST(BroadcastProfileTest, DefaultValues) {
+    BroadcastProfile profile("Unit Testing Default Values");
+
+    // Check if some select attributes have non-empty default values
+    ASSERT_FALSE(profile.getEnabled());
+    ASSERT_EQ(profile.getPort(), BROADCAST_DEFAULT_PORT);
+    ASSERT_TRUE(profile.getStreamWebsite() == QString(MIXXX_WEBSITE_URL));
+    ASSERT_FALSE(profile.getStreamDesc().isEmpty());
+    ASSERT_FALSE(profile.getStreamGenre().isEmpty());
+    ASSERT_FALSE(profile.getMetadataFormat().isEmpty());
+}
+
+} // namespace