diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 78de32d5485..f8588e91d4e 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-20  Andreas Tobler  <a.tobler@schweiz.ch>
+
+	* Makefile.am: Add rule for .S files to fix bootstrap on
+	solaris and alpha.
+	* Makefile.in: Regenerate.
+
 2004-06-16  Paolo Bonzini  <bonzini@gnu.org>
 
 	* boehm-gc/configure.ac: New name of configure.in.
diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am
index 502cb232641..af00bd54ccd 100644
--- a/boehm-gc/Makefile.am
+++ b/boehm-gc/Makefile.am
@@ -57,6 +57,8 @@ TESTS = gctest
 ## We use -Wp,-P to strip #line directives.  Irix `as' chokes on
 ## these.
 	$(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
+.S.lo:
+	$(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
 
 ## We have our own definition of LTCOMPILE because we want to use our
 ## CFLAGS, not those passed in from the top level make.
diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in
index fc5f9abb9ff..2be4b5939a9 100644
--- a/boehm-gc/Makefile.in
+++ b/boehm-gc/Makefile.in
@@ -352,7 +352,7 @@ MAKEOVERRIDES =
 all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj .s
+.SUFFIXES: .S .c .lo .o .obj .s
 am--refresh:
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -766,6 +766,8 @@ uninstall-info: uninstall-info-recursive
 
 .s.lo:
 	$(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
+.S.lo:
+	$(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: