diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index 88551ea41..5e56a0ee6 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -43,6 +43,7 @@
     <string name="pref_codec_speex32_key">pref_codec_speex32_key</string>
     <string name="pref_codecs_key">pref_codecs_key</string>
     <string name="pref_stun_server_key">pref_stun_server_key</string>
+    <string name="pref_video_codec_vp8_key">pref_video_codec_vp8_key</string>
 
 
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dd5edf359..a45e1374a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -124,4 +124,5 @@
 <string name="first_launch_bad_login_password">Couldn\'t connect; check your login and password and start again</string>
 
 <string name="pref_amr_summary">AMR codec might not be present on your phone</string>
+<string name="pref_video_codec_vp8_title">VP8</string>
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index ceeb8ba56..29b0c2b3c 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -97,6 +97,9 @@
 			<CheckBoxPreference android:key="@string/pref_video_codec_h264_key"
 				android:title="@string/pref_video_codec_h264_title"
 				android:defaultValue="false"></CheckBoxPreference>
+			<CheckBoxPreference android:key="@string/pref_video_codec_vp8_key"
+				android:title="@string/pref_video_codec_vp8_title"
+				android:defaultValue="false"></CheckBoxPreference>
 			<CheckBoxPreference android:key="@string/pref_video_codec_mpeg4_key"
 				android:title="@string/pref_video_codec_mpeg4_title"
 				android:defaultValue="true"></CheckBoxPreference>
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 107bbb9e7..6960b1593 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -569,6 +569,8 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			key = R.string.pref_video_codec_h264_key;
 		} else if ("H263-1998".equals(mime)) {
 			key = R.string.pref_video_codec_h263_key;
+		} else if ("VP8-DRAFT-0-3-2".equals(mime)) {
+			key = R.string.pref_video_codec_vp8_key;
 		} else {
 			Log.e("Unhandled video codec ", mime);
 			mLc.enablePayloadType(videoCodec, false);