Index: data/audio-profiles/mp3-lame.xml.in
===================================================================
--- data/audio-profiles/mp3-lame.xml.in	(revision 4917)
+++ data/audio-profiles/mp3-lame.xml.in	(working copy)
@@ -18,33 +18,34 @@
         <![CDATA[
             (gst-construct-pipeline
                 "audioconvert"
-                (gst-construct-element "lame"
-                    "mode" 4
-                    (if (= vbr_mode 0) 
+                (gst-construct-element
+                    "lame" "mode" 4 "quality" 2 "vbr" vbr_mode
+                    (if (= vbr_mode 0)
                         ("bitrate" bitrate)
-                        ("vbr" vbr_mode "vbr-quality" (- 9 vbr_quality))))
-                (if (and 
-                    (!= vbr_mode 0) 
-                    (gst-element-is-available "xingmux")) 
-                        "xingmux" 
-                        "")
+                        ("vbr-min-bitrate" 8 "vbr-max-bitrate" 320
+                            (if (= vbr_mode 3)
+                                ("vbr-mean-bitrate" (if (!= bitrate 0) bitrate 128))
+                                ("vbr-quality" (- 9 vbr_quality))))))
+                (if (and (!= vbr_mode 0) (gst-element-is-available "xingmux"))
+                    "xingmux"
+                    "")
                 (if (gst-element-is-available "id3v2mux")
                     "id3v2mux"
                     "id3mux"))
         ]]>
         </process>
         <variable id="vbr_mode">
-          <_name>VBR Mode</_name>
+          <_name>Mode</_name>
           <control-type>combo</control-type>
           <default-value>0</default-value>
           <possible-values>
             <_value value="0" enables="bitrate" disables="vbr_quality">Constant Bitrate</_value>
             <_value value="4" disables="bitrate" enables="vbr_quality">Variable Bitrate</_value>
-            <_value value="3" disables="bitrate" enables="vbr_quality">Average Bitrate</_value>
+            <_value value="3" enables="bitrate" disables="vbr_quality">Average Bitrate</_value>
           </possible-values>
         </variable>
         <variable id="vbr_quality">
-          <_name>VBR Quality</_name>
+          <_name>Quality</_name>
           <control-type>slider</control-type>
           <min-value>0</min-value>
           <_min-label>Worst</_min-label>
