diff --git a/webrtc/test/encoder_settings.cc b/webrtc/test/encoder_settings.cc
index db064bb..bae1350 100644
--- a/webrtc/test/encoder_settings.cc
+++ b/webrtc/test/encoder_settings.cc
@@ -60,6 +60,8 @@
   decoder.payload_name = encoder_settings.payload_name;
   if (encoder_settings.payload_name == "VP8") {
     decoder.decoder = VideoDecoder::Create(VideoDecoder::kVp8);
+  } else if (encoder_settings.payload_name == "VP9") {
+    decoder.decoder = VideoDecoder::Create(VideoDecoder::kVp9);
   } else {
     decoder.decoder = new FakeDecoder();
   }
diff --git a/webrtc/video/call.cc b/webrtc/video/call.cc
index fd41d75..b03b6c9 100644
--- a/webrtc/video/call.cc
+++ b/webrtc/video/call.cc
@@ -58,6 +58,8 @@
   switch (codec_type) {
     case kVp8:
       return VP8Decoder::Create();
+    case kVp9:
+      return VP9Decoder::Create();
   }
   assert(false);
   return NULL;
diff --git a/webrtc/video/loopback.cc b/webrtc/video/loopback.cc
index 4b49c31..8013833 100644
--- a/webrtc/video/loopback.cc
+++ b/webrtc/video/loopback.cc
@@ -142,6 +142,8 @@
   scoped_ptr<VideoEncoder> encoder;
   if (flags::Codec() == "VP8") {
     encoder.reset(VideoEncoder::Create(VideoEncoder::kVp8));
+  } else if (flags::Codec() == "VP9") {
+    encoder.reset(VideoEncoder::Create(VideoEncoder::kVp9));
   } else {
     // Codec not supported.
     assert(false && "Codec not supported!");
diff --git a/webrtc/video_decoder.h b/webrtc/video_decoder.h
index 03a564e..941c0ac 100644
--- a/webrtc/video_decoder.h
+++ b/webrtc/video_decoder.h
@@ -40,6 +40,7 @@
  public:
   enum DecoderType {
     kVp8,
+    kVp9
   };
 
   static VideoDecoder* Create(DecoderType codec_type);