diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5870db9119c9..4f50d1b21174 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-12  David Edelsohn  <edelsohn@gnu.org>
+
+	* rs6000/aix51.h (CPP_SPEC, CPLUSPLUS_CPP_SPEC): Fix typo in
+	__WCHAR_TYPE__ definition.
+	(WCHAR_TYPE_SIZE): #undef before #define.
+
 2001-03-12  Neil Booth  <neil@daikokuya.demon.co.uk>
 
         * cppfiles.c: Update comments.
diff --git a/gcc/config/rs6000/aix51.h b/gcc/config/rs6000/aix51.h
index fd679b9c487e..da6361c1615e 100644
--- a/gcc/config/rs6000/aix51.h
+++ b/gcc/config/rs6000/aix51.h
@@ -106,13 +106,13 @@ do {									\
 -D_AIX -D_AIX32 -D_AIX41 -D_AIX43 -D_AIX51 -Asystem=unix -Asystem=aix"
 
 #undef CPP_SPEC
-#define CPP_SPEC "%{posix: -D_POSIX_SOURCE} \
-  %{ansi: -D_ANSI_C_SOURCE} \
-  %{!maix64: -D__WCHAR_TYPE__="short unsigned int"} \
-  %{maix64: -D__64BIT__ -D_ARCH_PPC -D__WCHAR_TYPE__="unsigned int" \
-    -D__LONG_MAX__=9223372036854775807L} \
-  %{mpe: -I/usr/lpp/ppe.poe/include} \
-  %{pthread: -D_THREAD_SAFE} \
+#define CPP_SPEC "%{posix: -D_POSIX_SOURCE}\
+  %{ansi: -D_ANSI_C_SOURCE}\
+  %{!maix64: -D__WCHAR_TYPE__=short\\ unsigned\\ int}\
+  %{maix64: -D__64BIT__ -D_ARCH_PPC -D__LONG_MAX__=9223372036854775807L \
+    -D__WCHAR_TYPE__=unsigned\\ int}\
+  %{mpe: -I/usr/lpp/ppe.poe/include}\
+  %{pthread: -D_THREAD_SAFE}\
   %(cpp_cpu)"
 
 /* The GNU C++ standard library requires that these macros be 
@@ -123,9 +123,9 @@ do {									\
    -D_XOPEN_SOURCE_EXTENDED=1                   \
    -D_LARGE_FILE_API                            \
    -D_ALL_SOURCE                                \
-   %{!maix64: -D__WCHAR_TYPE__="short unsigned int"} \
-   %{maix64: -D__64BIT__ -D_ARCH_PPC -D__WCHAR_TYPE__="unsigned int" \
-     -D__LONG_MAX__=9223372036854775807L} \
+   %{!maix64: -D__WCHAR_TYPE__=short\\ unsigned\\ int}\
+   %{maix64: -D__64BIT__ -D_ARCH_PPC -D__LONG_MAX__=9223372036854775807L \
+     -D__WCHAR_TYPE__=unsigned\\ int}\
    %{mpe: -I/usr/lpp/ppe.poe/include}\
    %{pthread: -D_THREAD_SAFE}\
    %(cpp_cpu)"
@@ -213,6 +213,7 @@ do {									\
 /* __WCHAR_TYPE__ is dynamic, so do not define it statically.  */
 #define NO_BUILTIN_WCHAR_TYPE
 #undef WCHAR_TYPE
+#undef WCHAR_TYPE_SIZE
 
 /* Width of wchar_t in bits.  */
 #define WCHAR_TYPE_SIZE (!TARGET_64BIT ? 16 : 32)