diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index af461baff29be48d537f88d07f877147f3a2144d..9a24fb6067feefa5560425d94d960d1236b9ae81 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-30  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+	* Makefile.am (.s.lo): Renamed from `.s.o'.
+	* Makefile.in: Rebuilt.
+
 1999-06-21  Tom Tromey  <tromey@cygnus.com>
 
 	Alpha patch from Jeff Sturm:
diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am
index 921031f50bfd7c5f44a3ecaba223068d9871e0e9..b1d5dc54dcffdfc573e9bad97cdc03786e04b8af 100644
--- a/boehm-gc/Makefile.am
+++ b/boehm-gc/Makefile.am
@@ -54,7 +54,7 @@ all_objs = @addobjs@ $(libgcjgc_la_OBJECTS)
 $(all_objs) : config.h gc_priv.h gc_hdrs.h gc.h gc_mark.h
 
 ## FIXME: we shouldn't have to do this, but automake forces us to.
-.s.o:
+.s.lo:
 	$(LTCOMPILE) -x assembler-with-cpp -c $<
 
 ## We have our own definition of LTCOMPILE because we want to use our
diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in
index 7152f16003580e1d7b2616b5dd043b3c7e80bb32..19b706c9864802c99ef07dff7936e8c600e168a6 100644
--- a/boehm-gc/Makefile.in
+++ b/boehm-gc/Makefile.in
@@ -271,6 +271,9 @@ uninstall-toolexeclibLTLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
+.s.o:
+	$(COMPILE) -c $<
+
 .S.o:
 	$(COMPILE) -c $<
 
@@ -287,9 +290,6 @@ maintainer-clean-compile:
 .c.lo:
 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
 .S.lo:
 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 
@@ -486,7 +486,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 $(all_objs) : config.h gc_priv.h gc_hdrs.h gc.h gc_mark.h
 
-.s.o:
+.s.lo:
 	$(LTCOMPILE) -x assembler-with-cpp -c $<
 
 # Multilib support.