diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d48457213fe..c140b0e97be 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb  1 00:57:40 2000  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* dwarfout.c (SHORT_TYPE_SIZE): Correct default.
+
+	* tm.texi (Type Layout): Correct entry for CHAR_TYPE_SIZE.
+
 2000-01-31  Chandra Chavva <cchavva@cygnus.com>
 
 	* combine.c (try_combine) [HAVE_cc0]: Trying to check the missed
diff --git a/gcc/dwarfout.c b/gcc/dwarfout.c
index e8809361017..a0ac42d8c70 100644
--- a/gcc/dwarfout.c
+++ b/gcc/dwarfout.c
@@ -122,7 +122,7 @@ extern char *version_string;
 #endif
 
 #ifndef SHORT_TYPE_SIZE
-#define SHORT_TYPE_SIZE (BITS_PER_UNIT * 2)
+#define SHORT_TYPE_SIZE (BITS_PER_UNIT * MIN ((UNITS_PER_WORD + 1) / 2, 2))
 #endif
 
 #ifndef INT_TYPE_SIZE
diff --git a/gcc/tm.texi b/gcc/tm.texi
index d648344268c..5bd50bce807 100644
--- a/gcc/tm.texi
+++ b/gcc/tm.texi
@@ -1153,9 +1153,8 @@ macro must be at least 64.
 @findex CHAR_TYPE_SIZE
 @item CHAR_TYPE_SIZE
 A C expression for the size in bits of the type @code{char} on the
-target machine.  If you don't define this, the default is one quarter
-of a word.  (If this would be less than one storage unit, it is rounded up
-to one unit.)
+target machine.  If you don't define this, the default is
+@code{BITS_PER_UNIT}.
 
 @findex MAX_CHAR_TYPE_SIZE
 @item MAX_CHAR_TYPE_SIZE