diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e6e6dfd807ce2d127d537aef0d7eaf58192283ed..6226a1bfa63990aa392717ad011aa44829ecddbb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-02  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* doc/cfg.texi (Edges): Remove reference to Java.
+	(Maintaining the CFG): Ditto.
+
 2017-01-01  Jan Hubicka  <hubicka@ucw.cz>
 
 	PR middle-end/77674
diff --git a/gcc/doc/cfg.texi b/gcc/doc/cfg.texi
index a4d0c1d12fe85dadbb929907568516cda692eafa..31b212c6b403f03ab91d2e01c8007186f72dea39 100644
--- a/gcc/doc/cfg.texi
+++ b/gcc/doc/cfg.texi
@@ -285,7 +285,7 @@ is needed.  Note that this may require creation of a new basic block.
 Exception handling edges represent possible control transfers from a
 trapping instruction to an exception handler.  The definition of
 ``trapping'' varies.  In C++, only function calls can throw, but for
-Java and Ada, exceptions like division by zero or segmentation fault are
+Ada exceptions like division by zero or segmentation fault are
 defined and thus each instruction possibly throwing this kind of
 exception needs to be handled as control flow instruction.  Exception
 edges have the @code{EDGE_ABNORMAL} and @code{EDGE_EH} flags set.
@@ -594,8 +594,7 @@ can just use @code{NEXT_INSN} and @code{PREV_INSN} instead.  @xref{Insns}.
 Usually a code manipulating pass simplifies the instruction stream and
 the flow of control, possibly eliminating some edges.  This may for
 example happen when a conditional jump is replaced with an
-unconditional jump, but also when simplifying possibly trapping
-instruction to non-trapping while compiling Java.  Updating of edges
+unconditional jump.  Updating of edges
 is not transparent and each optimization pass is required to do so
 manually.  However only few cases occur in practice.  The pass may
 call @code{purge_dead_edges} on a given basic block to remove