diff --git a/gclient.py b/gclient.py
index 041dc3690..243fb59a6 100644
--- a/gclient.py
+++ b/gclient.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -930,6 +930,12 @@ solutions = [
         # Support for --revision 123
         revision = '%s@%s' % (solutions_names[index], revision)
       sol, rev = revision.split('@', 1)
+
+      if not sol in solutions_names and sol == 'trunk':
+        print >> sys.stderr, 'Rewriting "trunk" to "src" in --revision'
+        # Fix attempt for http://crbug.com/108515
+        sol = 'src'
+
       if not sol in solutions_names:
         #raise gclient_utils.Error('%s is not a valid solution.' % sol)
         print >> sys.stderr, ('Please fix your script, having invalid '