diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 83bd44748..54a5ef8f4 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -198,6 +198,7 @@ class PreferenceController extends Zend_Controller_Action
                 }
                 
                 $values['icecast_vorbis_metadata'] = $form->getValue('icecast_vorbis_metadata');
+                $values['output_sound_device_type'] = $form->getValue('output_sound_device_type');
             }
             if(!$error){
                 Application_Model_StreamSetting::setStreamSetting($values);
diff --git a/airtime_mvc/application/forms/StreamSetting.php b/airtime_mvc/application/forms/StreamSetting.php
index c27eea568..afabcd9dd 100644
--- a/airtime_mvc/application/forms/StreamSetting.php
+++ b/airtime_mvc/application/forms/StreamSetting.php
@@ -25,6 +25,17 @@ class Application_Form_StreamSetting extends Zend_Form
                 $output_sound_device->setAttrib("readonly", true);
             }
             $this->addElement($output_sound_device);
+            
+            $output_types = array("ALSA"=>"ALSA", "AO"=>"AO", "OSS"=>"OSS", "Portaudio"=>"Portaudio", "Pulseaudio"=>"Pulseaudio");
+            $output_type = new Zend_Form_Element_Select('output_sound_device_type');
+            $output_type->setLabel("Output Type")
+                    ->setMultiOptions($output_types)
+                    ->setValue($setting['output_sound_device_type'])
+                    ->setDecorators(array('ViewHelper'));
+            if($setting['output_sound_device'] != "true"){
+                $output_type->setAttrib("disabled", "disabled");
+            }
+            $this->addElement($output_type);
         }
         
         $icecast_vorbis_metadata = new Zend_Form_Element_Checkbox('icecast_vorbis_metadata');
@@ -39,7 +50,8 @@ class Application_Form_StreamSetting extends Zend_Form
     }
 
     public function isValid($data){
-        $this->populate(array("output_sound_device"=>$data['output_sound_device'], "icecast_vorbis_metadata"=>$data['icecast_vorbis_metadata']));
+        $this->populate(array("output_sound_device"=>$data['output_sound_device'], "icecast_vorbis_metadata"=>$data['icecast_vorbis_metadata'],
+                                "output_sound_device_type"=>$data['output_sound_device_type']));
         return true;
     }
 }
diff --git a/airtime_mvc/application/forms/StreamSettingSubForm.php b/airtime_mvc/application/forms/StreamSettingSubForm.php
index 96c348775..c004a3bea 100644
--- a/airtime_mvc/application/forms/StreamSettingSubForm.php
+++ b/airtime_mvc/application/forms/StreamSettingSubForm.php
@@ -68,7 +68,6 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm{
         if($disable_all){
             $bitrate->setAttrib("disabled", "disabled");
         }
-        $this->addElement($type);
         $this->addElement($bitrate);
 
         $output = new Zend_Form_Element_Select('output');
diff --git a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
index e2e49af59..9ffabfee2 100644
--- a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
+++ b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
@@ -20,6 +20,14 @@
             <dd id="hardwareOut-element">
                 <?php echo $this->form->getElement('output_sound_device') ?>
             </dd>
+            <dt id="hardwareOutType-label">
+                <label class="required">
+                <?php echo $this->form->getElement('output_sound_device_type')->getLabel() ?> :
+                </label>
+            </dt>
+            <dd id="hardwareOutType-element">
+                <?php echo $this->form->getElement('output_sound_device_type') ?>
+            </dd>
         <?php } ?>
             <dt id="vorbisMetadata-label">
                 <label class="required">
diff --git a/airtime_mvc/build/sql/defaultdata.sql b/airtime_mvc/build/sql/defaultdata.sql
index 48fe7efb5..e6d87c849 100644
--- a/airtime_mvc/build/sql/defaultdata.sql
+++ b/airtime_mvc/build/sql/defaultdata.sql
@@ -8,6 +8,7 @@ INSERT INTO cc_pref("keystr", "valstr") VALUES('max_bitrate', '320');
 INSERT INTO cc_pref("keystr", "valstr") VALUES('plan_level', 'disabled');
 
 INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('output_sound_device', 'false', 'boolean');
+INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('output_sound_device_type', 'ALSA', 'string');
 INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('icecast_vorbis_metadata', 'false', 'boolean');
 
 INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s1_enable', 'true', 'boolean');
diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
index eea41e0c2..832baf47f 100644
--- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js
+++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
@@ -125,6 +125,14 @@ $(document).ready(function() {
         rebuildStreamURL($(this))
     })
     
+    $("#output_sound_device").change(function(){
+        if($(this).is(':checked')){
+        	$("select[id=output_sound_device_type]").removeAttr('disabled')
+        }else{
+        	$("select[id=output_sound_device_type]").attr('disabled', 'disabled')
+        }
+    })
+    
     $("select[id$=data-type]").change(function(){
         if($(this).val() == 'ogg'){
             restrictOggBitrate($(this), true)
diff --git a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
index 3061ac7f7..48f9a6b58 100644
--- a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
@@ -162,6 +162,7 @@ class AirtimeDatabaseUpgrade{
                 INSERT INTO cc_pref(keystr, valstr) VALUES('plan_level', 'disabled');
                 
                 INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('output_sound_device', 'false', 'boolean');
+                INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('output_sound_device_type', 'ALSA', 'string');
                 INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('icecast_vorbis_metadata', 'false', 'boolean');
                 
                 INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('s1_enable', 'true', 'boolean');
diff --git a/install_minimal/upgrades/airtime-2.0.0/liquidsoap.cfg.200 b/install_minimal/upgrades/airtime-2.0.0/liquidsoap.cfg.200
index a96b9146f..d76e3af3d 100644
--- a/install_minimal/upgrades/airtime-2.0.0/liquidsoap.cfg.200
+++ b/install_minimal/upgrades/airtime-2.0.0/liquidsoap.cfg.200
@@ -6,6 +6,7 @@
 # Output settings                         #
 ###########################################
 output_sound_device = false
+output_sound_device_type = "ALSA"
 s1_output = "icecast"
 s2_output = "icecast"
 s3_output = "icecast"
diff --git a/python_apps/pypo/liquidsoap_scripts/liquidsoap.cfg b/python_apps/pypo/liquidsoap_scripts/liquidsoap.cfg
index 3a72bf5f9..13b23a87f 100644
--- a/python_apps/pypo/liquidsoap_scripts/liquidsoap.cfg
+++ b/python_apps/pypo/liquidsoap_scripts/liquidsoap.cfg
@@ -6,6 +6,7 @@
 # Output settings                         #
 ###########################################
 output_sound_device = false
+output_sound_device_type = "ALSA"
 s1_output = "icecast"
 s2_output = "icecast"
 s3_output = "icecast"
diff --git a/python_apps/pypo/liquidsoap_scripts/ls_script.liq b/python_apps/pypo/liquidsoap_scripts/ls_script.liq
index 147e9e484..5eb81cf62 100644
--- a/python_apps/pypo/liquidsoap_scripts/ls_script.liq
+++ b/python_apps/pypo/liquidsoap_scripts/ls_script.liq
@@ -53,6 +53,34 @@ add_skip_command(s)
 s = map_metadata(append_title, s)
 
 if output_sound_device then
+	output.prefered=output.dummy
+	%ifdef output.alsa
+	if output_sound_device_type == "ALSA" then
+		output.prefered=output.alsa
+	end
+	%endif
+	%ifdef output.ao
+	if output_sound_device_type == "AO" then
+		output.prefered=output.ao
+		output.prefered(mksafe(s))
+	end
+	%endif
+	%ifdef output.oss
+	if output_sound_device_type == "OSS" then
+		output.prefered=output.oss
+	end
+	%endif
+	%ifdef output.portaudio
+	if output_sound_device_type == "Portaudio" then
+		output.prefered=output.portaudio
+	end
+	%endif
+	%ifdef output.pulseaudio
+	if output_sound_device_type == "Pulseaudio" then
+		output.prefered=output.pulseaudio
+	end
+	%endif
+	
     ignore(out(s))
 end