diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a93fa931e52c..6293ff54c1b4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-29  Toomas Rosin <toomas at ns dot tklabor dot ee>
+
+	* Makefile.in(stmp-fixinc): quote shell assignment values
+
 2001-04-29  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* c-aux-info.c: NULL_PTR->NULL in calls to `concat'.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 948a52217e95..87edd1238aa2 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2130,8 +2130,8 @@ fixinc.sh: $(FIXINCSRCDIR)/mkfixinc.sh $(FIXINCSRCDIR)/fixincl.c \
 stmp-fixinc: fixinc.sh gsyslimits.h
 	rm -rf include; mkdir include
 	-chmod a+rx include
-	(TARGET_MACHINE=$(target); srcdir=`cd $(srcdir); pwd`; \
-	INSTALL_ASSERT_H=$(INSTALL_ASSERT_H); SHELL=$(SHELL) ;\
+	(TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); pwd`; \
+	INSTALL_ASSERT_H='$(INSTALL_ASSERT_H)'; SHELL='$(SHELL)' ;\
 	export TARGET_MACHINE srcdir INSTALL_ASSERT_H SHELL ; \
 	$(SHELL) ./fixinc.sh `pwd`/include $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS); \
 	rm -f include/syslimits.h; \