diff --git a/grit_action.gypi b/grit_action.gypi
index 041d704fe..ead90200c 100644
--- a/grit_action.gypi
+++ b/grit_action.gypi
@@ -15,15 +15,13 @@
 
 {
   'variables': {
-    'grit_info_cmd': ['python', '<(DEPTH)/tools/grit/grit_info.py',
-                      '<@(grit_defines)'],
     'grit_cmd': ['python', '<(DEPTH)/tools/grit/grit.py'],
   },
   'inputs': [
-    '<!@(<(grit_info_cmd) --inputs <(grit_grd_file))',
+    '<!@pymod_do_main(grit_info <@(grit_defines) --inputs <(grit_grd_file))',
   ],
   'outputs': [
-    '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(grit_grd_file))',
+    '<!@pymod_do_main(grit_info <@(grit_defines) --outputs \'<(grit_out_dir)\' <(grit_grd_file))',
   ],
   'action': ['<@(grit_cmd)',
              '-i', '<(grit_grd_file)', 'build',
diff --git a/gyp_chromium b/gyp_chromium
index 3cddef69f..18e7d65b0 100755
--- a/gyp_chromium
+++ b/gyp_chromium
@@ -19,6 +19,10 @@ chrome_src = os.path.abspath(os.path.join(script_dir, os.pardir))
 sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib'))
 import gyp
 
+# Add tools/grit so that pymod_do_main(grit_info ...) can find grit_info.py.
+sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit'))
+
+
 # On Windows, Psyco shortens warm runs of build/gyp_chromium by about
 # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
 # seconds.  Conversely, memory usage of build/gyp_chromium with Psyco