diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cd8d98a395d..cdd626c5544 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2000-02-05  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* i386/osf1elf.h: Add missing backslash to multiline string.
+
 2000-02-05  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* longlong.h [sparc] (udiv_qrnnd): Avoid stringifying macro arg.
diff --git a/gcc/config/i386/osf1elf.h b/gcc/config/i386/osf1elf.h
index f10f83b7437..2955ea11c20 100644
--- a/gcc/config/i386/osf1elf.h
+++ b/gcc/config/i386/osf1elf.h
@@ -18,7 +18,7 @@
 /* Note, -fpic and -fPIC are equivalent */
 #undef  CPP_SPEC
 #define CPP_SPEC "\
-%(cpp_cpu)
+%(cpp_cpu) \
 %{fpic: -D__SHARED__} %{fPIC: %{!fpic: -D__SHARED__}} \
 %{.S:	%{!ansi:%{!traditional:%{!traditional-cpp:%{!ftraditional: -traditional}}}}} \
 %{.S:	-D__LANGUAGE_ASSEMBLY %{!ansi:-DLANGUAGE_ASSEMBLY}} \
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7192d7d0091..2181be70f95 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-05  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* tinfo.h: Remove apostrophes from C++ comment (xgettext
+	thinks this file is plain C).
+
 2000-02-05  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* Makefile.in (call.o): Depend on $(EXPR_H).
diff --git a/gcc/cp/tinfo.h b/gcc/cp/tinfo.h
index 3df662dfef2..b392227a3ac 100644
--- a/gcc/cp/tinfo.h
+++ b/gcc/cp/tinfo.h
@@ -32,8 +32,8 @@ struct __user_type_info : public std::type_info {
   // BOFF == -2, SUBTYPE is not a public base.
   // BOFF == -3, SUBTYPE occurs as multiple public non-virtual bases.
   //    Lazily search the non-virtual bases of TARGET.
-  // For backwards compatibility set BOFF to -1, that is the safe `don't know'
-  // value. We don't care about SUBTYPES as private bases of TARGET, as they
+  // For backwards compatibility set BOFF to -1, that is the safe "unknown"
+  // value. We do not care about SUBTYPES as private bases of TARGET, as they
   // can never succeed as downcasts, only as crosscasts -- and then only if
   // they are virtual. This is more complicated that it might seem.
   void *dyncast (int boff,
diff --git a/gcc/exgettext b/gcc/exgettext
index 93d553cba76..3087d1df809 100755
--- a/gcc/exgettext
+++ b/gcc/exgettext
@@ -59,7 +59,7 @@ generate_keyword_options='
     name = substr($0, 1, paren_index - 1)
     sub(/[^0-9A-Z_a-z]*$/, "", name)
     sub(/[	 ]+PARAMS/, "", name)
-    sub(/[	 ]+VPROTO/, "", name)
+    sub(/[	 ]+VPARAMS/, "", name)
     sub(/.*[^0-9A-Z_a-z]/, "", name)
 
     args = substr($0, paren_index)
diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index 3509414b6f3..82b20b157d4 100644
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-05  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* POTFILES.in: Remove stupid.c.
+	* exgettext: s/VPROTO/VPARAMS/ now that we are no longer using
+	VPROTO.
+
 1999-12-31  Manfred Hollstein  <mhollstein@cygnus.com>
 
 	* POTFILES.in: Remove config/xm-siglist.h.
diff --git a/gcc/po/POTFILES.in b/gcc/po/POTFILES.in
index 939e8e7a8bd..60253c3f677 100644
--- a/gcc/po/POTFILES.in
+++ b/gcc/po/POTFILES.in
@@ -749,7 +749,6 @@ simplify-rtx.c
 stack.h
 stmt.c
 stor-layout.c
-stupid.c
 sys-protos.h
 sys-types.h
 system.h