diff --git a/.gitignore b/.gitignore
index 17d8f835e..ccba8289f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,7 +51,9 @@
 /third_party/gold
 /third_party/google-gflags/src
 /third_party/google-visualization-python
+/third_party/icu
 /third_party/jsoncpp
+/third_party/junit
 /third_party/libjingle
 /third_party/libjpeg
 /third_party/libjpeg_turbo
@@ -60,6 +62,7 @@
 /third_party/libyuv
 /third_party/llvm-build
 /third_party/oauth2
+/third_party/openssl
 /third_party/opus
 /third_party/protobuf
 /third_party/valgrind
diff --git a/DEPS b/DEPS
index 64a08c8ea..d3e6bdacf 100644
--- a/DEPS
+++ b/DEPS
@@ -10,7 +10,7 @@ vars = {
   # If you do not know, use the full path while defining your new deps entry.
   "googlecode_url": "http://%s.googlecode.com/svn",
   "chromium_trunk" : "http://src.chromium.org/svn/trunk",
-  "chromium_revision": "203806",
+  "chromium_revision": "205140",
 
   # A small subset of WebKit is needed for the Android Python test framework.
   "webkit_trunk": "http://src.chromium.org/blink/trunk",
@@ -44,12 +44,27 @@ deps = {
   "third_party/google-gflags/src":
     (Var("googlecode_url") % "google-gflags") + "/trunk/src@45",
 
+  "third_party/icu/":
+    From("chromium_deps", "src/third_party/icu"),
+
+  "third_party/jsoncpp/":
+    Var("chromium_trunk") + "/src/third_party/jsoncpp@" + Var("chromium_revision"),
+
+  "third_party/jsoncpp/source":
+    "http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp@248",
+
+  "third_party/junit/":
+    (Var("googlecode_url") % "webrtc") + "/deps/third_party/junit@3367",
+
   "third_party/libjpeg":
     Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_revision"),
 
   "third_party/libjpeg_turbo":
     From("chromium_deps", "src/third_party/libjpeg_turbo"),
 
+  "third_party/libsrtp/":
+    From("chromium_deps", "src/third_party/libsrtp"),
+
   "third_party/libvpx":
     Var("chromium_trunk") + "/deps/third_party/libvpx@208227",
 
@@ -107,6 +122,9 @@ deps_os = {
   "unix": {
     "third_party/gold":
       From("chromium_deps", "src/third_party/gold"),
+
+    "third_party/openssl":
+      From("chromium_deps", "src/third_party/openssl"),
   },
   "android": {
     # Precompiled tools needed for Android test execution. Needed since we can't
@@ -125,6 +143,9 @@ deps_os = {
 
     "third_party/WebKit/Tools/Scripts":
       Var("webkit_trunk") + "/Tools/Scripts@151677",
+
+    "third_party/openssl":
+      From("chromium_deps", "src/third_party/openssl"),
   },
 }
 
@@ -164,7 +185,7 @@ hooks = [
     # A change to a .gyp, .gypi, or to GYP itself should run the generator.
     "pattern": ".",
     "action": ["python", Var("root_dir") + "/build/gyp_chromium",
-               "--depth=" + Var("root_dir"), Var("root_dir") + "/webrtc.gyp",
+               "--depth=" + Var("root_dir"), Var("root_dir") + "/all.gyp",
                Var("extra_gyp_flag")],
   },
 ]
diff --git a/all.gyp b/all.gyp
new file mode 100644
index 000000000..f2d6e30dd
--- /dev/null
+++ b/all.gyp
@@ -0,0 +1,22 @@
+# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+{
+  'targets': [
+    {
+      'target_name': 'All',
+      'type': 'none',
+      'dependencies': [
+        'webrtc/webrtc.gyp:*',
+        'talk/libjingle.gyp:*',
+        'talk/libjingle_examples.gyp:*',
+        'talk/libjingle_tests.gyp:*',
+      ],
+    },
+  ],
+}
diff --git a/talk/libjingle_all.gyp b/talk/libjingle_all.gyp
deleted file mode 100644
index 1bfa2df09..000000000
--- a/talk/libjingle_all.gyp
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# libjingle
-# Copyright 2012, Google Inc.
-#
-# Redistribution and use in source and binary forms, with or without 
-# modification, are permitted provided that the following conditions are met:
-#
-#  1. Redistributions of source code must retain the above copyright notice, 
-#     this list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the above copyright notice,
-#     this list of conditions and the following disclaimer in the documentation
-#     and/or other materials provided with the distribution.
-#  3. The name of the author may not be used to endorse or promote products 
-#     derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-{
-  'targets': [
-    {
-      'target_name': 'All', 
-      'type': 'none',   
-      'dependencies': [ 
-        'libjingle.gyp:*',  
-        'libjingle_examples.gyp:*',  
-        'libjingle_tests.gyp:*',  
-      ],
-    },
-  ],
-}
diff --git a/webrtc.gyp b/webrtc/webrtc.gyp
similarity index 52%
rename from webrtc.gyp
rename to webrtc/webrtc.gyp
index 7daaf8d98..086d4831a 100644
--- a/webrtc.gyp
+++ b/webrtc/webrtc.gyp
@@ -7,21 +7,21 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 {
-  'includes': ['webrtc/build/common.gypi',],
+  'includes': ['build/common.gypi',],
   'variables': {
     'webrtc_all_dependencies': [
-      'webrtc/common_audio/common_audio.gyp:*',
-      'webrtc/common_video/common_video.gyp:*',
-      'webrtc/modules/modules.gyp:*',
-      'webrtc/system_wrappers/source/system_wrappers.gyp:*',
-      'webrtc/video_engine/video_engine.gyp:*',
-      'webrtc/voice_engine/voice_engine.gyp:*',
+      'common_audio/common_audio.gyp:*',
+      'common_video/common_video.gyp:*',
+      'modules/modules.gyp:*',
+      'system_wrappers/source/system_wrappers.gyp:*',
+      'video_engine/video_engine.gyp:*',
+      'voice_engine/voice_engine.gyp:*',
       '<(webrtc_vp8_dir)/vp8.gyp:*',
     ],
   },
   'targets': [
     {
-      'target_name': 'All',
+      'target_name': 'webrtc',
       'type': 'none',
       'dependencies': [
         '<@(webrtc_all_dependencies)',
@@ -29,17 +29,17 @@
       'conditions': [
         ['include_tests==1', {
           'dependencies': [
-            'webrtc/system_wrappers/source/system_wrappers_tests.gyp:*',
-            'webrtc/test/metrics.gyp:*',
-            'webrtc/test/test.gyp:*',
-            'webrtc/tools/tools.gyp:*',
-            'tools/e2e_quality/e2e_quality.gyp:*',
+            'system_wrappers/source/system_wrappers_tests.gyp:*',
+            'test/metrics.gyp:*',
+            'test/test.gyp:*',
+            'tools/tools.gyp:*',
+            '../tools/e2e_quality/e2e_quality.gyp:*',
           ],
         }],
         ['OS=="android"', {
           'dependencies': [
-            'tools/android/android_tools_precompiled.gyp:*',
-            'tools/android-dummy-test/android_dummy_test.gyp:*',
+            '../tools/android/android_tools_precompiled.gyp:*',
+            '../tools/android-dummy-test/android_dummy_test.gyp:*',
           ],
         }],
       ],