diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 27f877faf647efb79f216c1fc90ece6edfd5d871..bc78ee314fdebf525541fff2f08121a05c1df5bf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR bootstrap/35619
+	* Makefile.in (stmp-fixinc): Ensure `include-fixed' is created
+	in the directory this rule is called from, rather than the
+	toplevel 'gcc' directory, to fix in-tree build.
+
 2009-09-19  Chris Demetriou  <cgd@google.com>
 
 	PR preprocessor/28435:
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index cbd68d84ee4ce7868496372cf1eb7ca5e9c30a65..fde75ca3198d90c2f34dfd7df2366f43b8c2c9f1 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3835,9 +3835,10 @@ stmp-fixinc: gsyslimits.h macro_list fixinc_list \
 	    chmod a+rx $${fix_dir} || true; \
 	    (TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \
 	      SHELL='$(SHELL)'; MACRO_LIST=`${PWD_COMMAND}`/macro_list ; \
+	      gcc_dir=`${PWD_COMMAND}` ; \
 	      export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
 	      cd $(build_objdir)/fixincludes && \
-	      $(SHELL) ./fixinc.sh ../../gcc/$${fix_dir} \
+	      $(SHELL) ./fixinc.sh "$${gcc_dir}/$${fix_dir}" \
 	        $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) ); \
 	    rm -f $${fix_dir}/syslimits.h; \
 	    if [ -f $${fix_dir}/limits.h ]; then \