diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bc5a1ca4bd26..4abe249afe73 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-22  Branko Cibej  <branko.cibej@hermes.si>
+
+        * Makefile.am (AM_MAKEFLAGS): Added WERROR to list of flags.
+
 2000-06-22 Steven King <sxking@uswest.net>
 
         * acinclude.m4: Check for sinl, _sinl using 1 parameter.
diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am
index 1af4454819ce..10bad08433e0 100644
--- a/libstdc++-v3/Makefile.am
+++ b/libstdc++-v3/Makefile.am
@@ -141,8 +141,8 @@ AM_MAKEFLAGS = \
 	"NM=$(NM)" \
 	"NM_FOR_BUILD=$(NM_FOR_BUILD)" \
 	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
-	"DESTDIR=$(DESTDIR)" 
-
+	"DESTDIR=$(DESTDIR)" \
+	"WERROR=$(WERROR)"
 
 
 
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index 4d9da45353da..899317e3f1c7 100644
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -193,7 +193,8 @@ AM_MAKEFLAGS = \
 	"NM=$(NM)" \
 	"NM_FOR_BUILD=$(NM_FOR_BUILD)" \
 	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
-	"DESTDIR=$(DESTDIR)" 
+	"DESTDIR=$(DESTDIR)" \
+	"WERROR=$(WERROR)"
 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs