diff --git a/lib/installer-exclude/libjitsi.jar b/lib/installer-exclude/libjitsi.jar
index 8b1fb5c4b..d8d2bf480 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 95ba0041e..ee0be10e4 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -1387,6 +1387,7 @@ impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultProfile=Default profile to encode into:
 impl.neomedia.configform.H264.defaultProfile.baseline=Baseline
 impl.neomedia.configform.H264.defaultProfile.main=Main
+impl.neomedia.configform.H264.preset=Encoder Preset
 impl.neomedia.configform.H264.preferredKeyFrameRequester=Preferred method to request key frames:
 impl.neomedia.configform.H264.preferredKeyFrameRequester.rtcp=RTCP
 impl.neomedia.configform.H264.preferredKeyFrameRequester.signaling=Signaling
diff --git a/src/net/java/sip/communicator/impl/neomedia/codec/video/h264/ConfigurationPanel.java b/src/net/java/sip/communicator/impl/neomedia/codec/video/h264/ConfigurationPanel.java
index 776d132b0..36892b3b7 100644
--- a/src/net/java/sip/communicator/impl/neomedia/codec/video/h264/ConfigurationPanel.java
+++ b/src/net/java/sip/communicator/impl/neomedia/codec/video/h264/ConfigurationPanel.java
@@ -108,6 +108,28 @@ public ConfigurationPanel()
                 preferredKeyFrameRequesterComboBox,
                 gridBagConstraints);
 
+        JLabel presetLabel
+            = new JLabel(resources.getI18NString(
+                            "impl.neomedia.configform.H264.preset"));
+        gridBagConstraints.anchor = GridBagConstraints.LINE_START;
+        gridBagConstraints.gridx = 0;
+        gridBagConstraints.gridy = 2;
+        contentPanel.add(presetLabel, gridBagConstraints);
+
+        JComboBox presetComboBox = new JComboBox();
+        presetComboBox.setEditable(false);
+        for(String presetSetting : JNIEncoder.AVAILABLE_PRESETS)
+        {
+            presetComboBox.addItem(
+                    new NameValuePair(presetSetting, presetSetting));
+        }
+        gridBagConstraints.anchor = GridBagConstraints.LINE_START;
+        gridBagConstraints.gridx = 1;
+        gridBagConstraints.gridy = 2;
+        contentPanel.add(
+            presetComboBox,
+                gridBagConstraints);
+
         /*
          * Load the values from the ConfigurationService into the UI components.
          */
@@ -131,6 +153,12 @@ public ConfigurationPanel()
         addActionListener(
                 preferredKeyFrameRequesterComboBox,
                 KeyFrameControl.KeyFrameRequester.PREFERRED_PNAME);
+
+        setSelectedNameValuePair(
+                presetComboBox,
+                configuration.getString(
+                    JNIEncoder.PRESET_PNAME, JNIEncoder.DEFAULT_PRESET));
+        addActionListener(presetComboBox, JNIEncoder.PRESET_PNAME);
     }
 
     /**