diff --git a/plugins/jamendo/jamendo-prefs.ui b/plugins/jamendo/jamendo-prefs.ui
index 193612b..86145eb 100644
--- a/plugins/jamendo/jamendo-prefs.ui
+++ b/plugins/jamendo/jamendo-prefs.ui
@@ -14,6 +14,19 @@
       </row>
     </data>
   </object>
+  <object class="GtkListStore" id="model2">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Ogg Vorbis</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">MP3</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkDialog" id="preferences_dialog">
     <property name="visible">True</property>
     <property name="title" translatable="yes">Jamendo Preferences</property>
@@ -140,6 +153,50 @@
                     <property name="focus_on_click">True</property>
                     <property name="model">model1</property>
                     <child>
+                      <object class="GtkCellRendererText" id="renderer2"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="stream_label">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">_Stream Format:</property>
+                    <property name="use_underline">True</property>
+                    <property name="use_markup">False</property>
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0.5</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">8</property>
+                    <property name="ypad">0</property>
+                    <property name="mnemonic_widget">stream_combobox</property>
+                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                    <property name="width_chars">-1</property>
+                    <property name="single_line_mode">False</property>
+                    <property name="angle">0</property>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="stream_combobox">
+                    <property name="visible">True</property>
+                    <property name="add_tearoffs">False</property>
+                    <property name="focus_on_click">True</property>
+                    <property name="model">model2</property>
+                    <child>
                       <object class="GtkCellRendererText" id="renderer1"/>
                       <attributes>
                         <attribute name="text">0</attribute>
diff --git a/plugins/jamendo/jamendo/JamendoConfigureDialog.py b/plugins/jamendo/jamendo/JamendoConfigureDialog.py
index b6d160e..d6a09c8 100644
--- a/plugins/jamendo/jamendo/JamendoConfigureDialog.py
+++ b/plugins/jamendo/jamendo/JamendoConfigureDialog.py
@@ -23,9 +23,11 @@ import gtk
 import gconf, gnome
 
 gconf_keys = {	'format' : '/apps/rhythmbox/plugins/jamendo/format',
-		'sorting': '/apps/rhythmbox/plugins/jamendo/sorting'
+		'sorting': '/apps/rhythmbox/plugins/jamendo/sorting',
+		'stream' : '/apps/rhythmbox/plugins/jamendo/stream'
 	     }
 format_list = ['ogg3', 'mp32']
+stream_list = ['ogg2', 'mp31']
 
 class JamendoConfigureDialog (object):
 	def __init__(self, builder_file):
@@ -36,6 +38,7 @@ class JamendoConfigureDialog (object):
 
 		self.dialog = builder.get_object('preferences_dialog')
 		self.audio_combobox = builder.get_object("audio_combobox")
+		self.stream_combobox = builder.get_object("stream_combobox")
 
 		format_text = self.gconf.get_string(gconf_keys['format'])
 		if not format_text:
@@ -46,8 +49,18 @@ class JamendoConfigureDialog (object):
 			format = 0
 		self.audio_combobox.set_active(format)
 
+		stream_text = self.gconf.get_string(gconf_keys['stream'])
+		if not stream_text:
+			stream_text = "ogg2"
+		try:
+			stream_format = stream_list.index(stream_text)
+		except ValueError:
+			stream_format = 0
+		self.stream_combobox.set_active(stream_format)
+
 		self.dialog.connect("response", self.dialog_response)
 		self.audio_combobox.connect("changed", self.audio_combobox_changed)
+		self.stream_combobox.connect("changed", self.stream_combobox_changed)
 
 	def get_dialog (self):
 		return self.dialog
@@ -58,3 +71,7 @@ class JamendoConfigureDialog (object):
 	def audio_combobox_changed (self, combobox):
 		format = self.audio_combobox.get_active()
 		self.gconf.set_string(gconf_keys['format'], format_list[format])
+
+	def stream_combobox_changed (self, combobox):
+		stream_format = self.stream_combobox.get_active()
+		self.gconf.set_string(gconf_keys['stream'], stream_list[stream_format])
diff --git a/plugins/jamendo/jamendo/JamendoSaxHandler.py b/plugins/jamendo/jamendo/JamendoSaxHandler.py
index f433182..8f78ff2 100644
--- a/plugins/jamendo/jamendo/JamendoSaxHandler.py
+++ b/plugins/jamendo/jamendo/JamendoSaxHandler.py
@@ -22,11 +22,16 @@ import rhythmdb
 import xml.sax, xml.sax.handler
 import datetime
 
+import gobject
+import gtk
+import gnome, gconf
+import JamendoConfigureDialog
+
 data = {"artist" : ["name"],
         "album" : ["name","id","releasedate","id3genre"],
         "track" : ["name","id","numalbum","duration","id3genre"]}
-        
-stream_url = "http://api.jamendo.com/get2/stream/track/redirect/?id=%s&streamencoding=ogg2"
+
+stream_url = "http://api.jamendo.com/get2/stream/track/redirect/?id=%s&streamencoding="
 
 class JamendoSaxHandler(xml.sax.handler.ContentHandler):
 	def __init__(self,db,entry_type):
@@ -38,6 +43,12 @@ class JamendoSaxHandler(xml.sax.handler.ContentHandler):
 			self.__data[section]={}
 		self.__section = ""
 		self.__num_tracks = 0
+		
+		# Detects stream format
+		stream_format = gconf.client_get_default().get_string(JamendoConfigureDialog.gconf_keys['stream'])
+		if not stream_format:
+			stream_format = 'ogg2'
+		self.stream_format = stream_format
 
 
 	def startElement(self, name, attrs):
@@ -55,7 +66,7 @@ class JamendoSaxHandler(xml.sax.handler.ContentHandler):
 		elif name == "track":
 			self.__num_tracks = self.__num_tracks + 1
 
-			track_url = stream_url % (self.__data["track"]["id"])	
+			track_url = (stream_url + self.stream_format) % (self.__data["track"]["id"])	
 						
 			release_date = self.__data["album"]["releasedate"]
 			year = int(release_date[0:4])
