diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 99e629b4a57a..6333d011d35d 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-03  Kazu Hirata  <kazu@codesourcery.com>
+
+	* java-tree.h, javaop.def, jcf-parse.c: Fix comment typos.
+
 2007-02-02  Andrew Haley  <aph@redhat.com>
 
 	* expr.c (expand_byte_code): Call cache_this_class_ref() and
diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h
index f564b5918fd4..ab3ff47e467f 100644
--- a/gcc/java/java-tree.h
+++ b/gcc/java/java-tree.h
@@ -764,7 +764,7 @@ union lang_tree_node
 #define FIELD_LOCAL_ALIAS(DECL) DECL_LANG_FLAG_6 (VAR_OR_FIELD_CHECK (DECL))
 
 /* True when DECL, which aliases an outer context local variable is
-   used by the inner classe */
+   used by the inner classes.  */
 #define FIELD_LOCAL_ALIAS_USED(DECL) DECL_LANG_FLAG_7 (VAR_OR_FIELD_CHECK (DECL))
 
 /* True when DECL is a this$<n> field. Note that
diff --git a/gcc/java/javaop.def b/gcc/java/javaop.def
index cf5a906826eb..bb3543034ff9 100644
--- a/gcc/java/javaop.def
+++ b/gcc/java/javaop.def
@@ -88,7 +88,7 @@ TEST: Compares an integer (popped from the stack) against zero.
 	If the test (in OPERAND_VALUE) is true, goto a relative
 	offset given by the next two bytes.
 
-COND:  Compares two values (popped from the stack) againt each other.
+COND:  Compares two values (popped from the stack) against each other.
 	If the test (in OPERAND_VALUE) is true, goto a relative
 	offset given by the next two bytes.
 
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 59b9e89c3af2..39abb57a63e5 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -259,7 +259,7 @@ java_read_sourcefilenames (const char *fsource_filename)
 /* Given a relative pathname such as foo/bar.java, attempt to find a
    longer pathname with the same suffix.  
 
-   This is a best guess heuristic; with some weird class hierarcies we
+   This is a best guess heuristic; with some weird class hierarchies we
    may fail to pick the correct source file.  For example, if we have
    the filenames foo/bar.java and also foo/foo/bar.java, we do not
    have enough information to know which one is the right match for