diff --git a/DEPS b/DEPS
index 1565f180bc..bfea0f3dbb 100644
--- a/DEPS
+++ b/DEPS
@@ -57,6 +57,12 @@ deps = {
   "third_party/libyuv":
     (Var("googlecode_url") % "libyuv") + "/trunk@426",
 
+  "third_party/opus":
+    Var("chromium_trunk") + "/src/third_party/opus@163910",
+
+  "third_party/opus/src":
+    Var("chromium_trunk") + "/deps/third_party/opus@162558",
+
   "third_party/protobuf":
     Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"),
 
diff --git a/tools/create_supplement_gypi.py b/tools/create_supplement_gypi.py
index f7b2696c4d..7f996e7472 100644
--- a/tools/create_supplement_gypi.py
+++ b/tools/create_supplement_gypi.py
@@ -15,7 +15,6 @@ supplement_gypi = """#!/usr/bin/env python
 {
   'variables': {
     'build_with_chromium': 0,
-    'build_with_mozilla': 0,
   }
 }
 """
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index a81b7ed57f..a0ec71d7a6 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -72,7 +72,7 @@
     'build_libyuv%': 1,
     'build_libvpx%': 1,
 
-    # Enable to use the Mozilla internal Opus version.
+    # Enable to use the Mozilla internal settings.
     'build_with_mozilla%': 0,
 
     'libyuv_dir%': '<(DEPTH)/third_party/libyuv',
@@ -143,6 +143,12 @@
       #'WEBRTC_SVNREVISION="<!(python <(webrtc_root)/build/version.py)"',
     ],
     'conditions': [
+      ['build_with_mozilla==1', {
+        'defines': [
+          # Changes settings for Mozilla build.
+          'WEBRTC_MOZILLA_BUILD',
+         ],
+      }],
       ['build_with_chromium==1', {
         'defines': [
           # Changes settings for Chromium build.
diff --git a/webrtc/modules/audio_coding/codecs/opus/opus.gypi b/webrtc/modules/audio_coding/codecs/opus/opus.gypi
index 809068c235..5c29d6c07e 100644
--- a/webrtc/modules/audio_coding/codecs/opus/opus.gypi
+++ b/webrtc/modules/audio_coding/codecs/opus/opus.gypi
@@ -22,19 +22,10 @@
             '<(DEPTH)/third_party/opus/opus.gyp:opus'
           ],
           'include_dirs': [
-            '<(webrtc_root)/../third_party/opus/source/include',
+            '<(DEPTH)/third_party/opus',
           ],
         }],
       ],
-      'direct_dependent_settings': {
-        'conditions': [
-          ['build_with_mozilla==1', {
-            'include_dirs': [
-              '$(DIST)/include/opus',
-            ],
-          }],
-        ],
-      },
       'sources': [
         'interface/opus_interface.h',
         'opus_interface.c',