diff --git a/lib/installer-exclude/libjitsi.jar b/lib/installer-exclude/libjitsi.jar
index 2b4ce2971..f49281910 100644
Binary files a/lib/installer-exclude/libjitsi.jar and b/lib/installer-exclude/libjitsi.jar differ
diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index bc1e74de1..fccaf9794 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -1398,7 +1398,8 @@ impl.media.configform.VIDEO=&Camera:
 impl.media.configform.VIDEO_MORE_SETTINGS=More settings
 impl.media.configform.VIDEO_RESOLUTION=Video resolution
 impl.media.configform.VIDEO_FRAME_RATE=Custom frame rate (per sec.)
-impl.media.configform.VIDEO_PACKETS_POLICY=Maximum allowed bandwidth (kBytes/s)
+impl.media.configform.VIDEO_PACKETS_POLICY=RTP pacing threshold (kBytes/s)
+impl.media.configform.VIDEO_BITRATE=Video bitrate (kilobits/s)
 impl.media.configform.VIDEO_RESET=Reset defaults
 impl.media.configform.AUDIO_DEVICE_CONNECTED=Connected device:
 impl.media.configform.AUDIO_DEVICE_DISCONNECTED=Disconnected device:
diff --git a/src/net/java/sip/communicator/impl/neomedia/MediaConfigurationImpl.java b/src/net/java/sip/communicator/impl/neomedia/MediaConfigurationImpl.java
index 6293a0069..d470aab28 100644
--- a/src/net/java/sip/communicator/impl/neomedia/MediaConfigurationImpl.java
+++ b/src/net/java/sip/communicator/impl/neomedia/MediaConfigurationImpl.java
@@ -549,6 +549,11 @@ private static Component createVideoAdvancedSettings()
             resources.getI18NString(
                     "impl.media.configform.VIDEO_PACKETS_POLICY")),
             constraints);
+        constraints.gridy = 3;
+        centerPanel.add(new JLabel(
+            resources.getI18NString(
+                    "impl.media.configform.VIDEO_BITRATE")),
+            constraints);
 
         constraints.weightx = 1;
         constraints.gridx = 1;
@@ -598,15 +603,15 @@ public void actionPerformed(ActionEvent e)
         });
 
         final JSpinner videoMaxBandwidth = new JSpinner(new SpinnerNumberModel(
-            deviceConfig.getVideoMaxBandwidth(),
+            deviceConfig.getVideoRTPPacingThreshold(),
             1, Integer.MAX_VALUE, 1));
         videoMaxBandwidth.addChangeListener(new ChangeListener()
         {
             public void stateChanged(ChangeEvent e)
             {
-                deviceConfig.setVideoMaxBandwidth(
-                        ((SpinnerNumberModel)videoMaxBandwidth.getModel())
-                            .getNumber().intValue());
+                deviceConfig.setVideoRTPPacingThreshold(
+                        ((SpinnerNumberModel) videoMaxBandwidth.getModel())
+                                .getNumber().intValue());
             }
         });
         constraints.gridx = 1;
@@ -614,6 +619,21 @@ public void stateChanged(ChangeEvent e)
         constraints.insets = new Insets(0, 0, 5, 5);
         centerPanel.add(videoMaxBandwidth, constraints);
 
+        final JSpinner videoBitrate = new JSpinner(new SpinnerNumberModel(
+            deviceConfig.getVideoBitrate(),
+            1, Integer.MAX_VALUE, 1));
+        videoBitrate.addChangeListener(new ChangeListener()
+        {
+            public void stateChanged(ChangeEvent e)
+            {
+                deviceConfig.setVideoBitrate(
+                        ((SpinnerNumberModel) videoBitrate.getModel())
+                                .getNumber().intValue());
+            }
+        });
+        constraints.gridy = 3;
+        centerPanel.add(videoBitrate, constraints);
+
         resetDefaultsButton.addActionListener(new ActionListener()
         {
             public void actionPerformed(ActionEvent e)
@@ -626,7 +646,9 @@ public void actionPerformed(ActionEvent e)
                 // unlimited framerate
                 deviceConfig.setFrameRate(-1);
                 videoMaxBandwidth.setValue(
-                        DeviceConfiguration.DEFAULT_VIDEO_MAX_BANDWIDTH);
+                        DeviceConfiguration.DEFAULT_VIDEO_RTP_PACING_THRESHOLD);
+                videoBitrate.setValue(
+                        DeviceConfiguration.DEFAULT_VIDEO_BITRATE);
             }
         });