diff --git a/Makefile.am b/Makefile.am
index fba0c26e..2df9b51b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,7 @@ EXTRA_DIST = \
   CHANGES \
   CONTRIBUTORS \
   include/gtest/internal/gtest-type-util.h.pump \
+  scons/SConscript \
   scripts/gen_gtest_pred_impl.py \
   src/gtest-all.cc
 
diff --git a/scons/SConscript b/scons/SConscript
index 3fcda157..8c2f9e40 100644
--- a/scons/SConscript
+++ b/scons/SConscript
@@ -96,10 +96,11 @@ __author__ = 'joi@google.com (Joi Sigurdsson)'
 Import('env')
 env = env.Clone()
 
-# Include paths to gtest headers are relative to a directory two above
-# the gtest directory itself, and this SConscript file is one
-# directory deeper than the gtest directory.
-env.Prepend(CPPPATH = ['../../..'])
+# Include paths to gtest headers are relative to either the gtest
+# directory or the 'include' subdirectory of it, and this SConscript
+# file is one directory deeper than the gtest directory.
+env.Prepend(CPPPATH = ['..',
+                       '../include'])
 
 # TODO(joi@google.com) Fix the code that causes this warning so that
 # we see all warnings from the compiler about possible 64-bit porting