diff --git a/ChangeLog b/ChangeLog
index 7c0efe865bf..8cca88e988a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-08  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+	* Makefile.in (TARGET_CONFIGDIRS): Wrong place. Removed note about
+	libjava.
+	* configure.in (target_libs): Removed `target-libjava'.
+
 2000-12-08  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
 	* Makefile.in (TARGET_CONFIGDIRS): Added note about libjava.
diff --git a/Makefile.in b/Makefile.in
index 4f770fb3934..9456df8f0e7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -169,10 +169,6 @@ OTHERS =
 
 # This is set by the configure script to the list of directories which
 # should be built using the target tools.
-# Temporary note: Java hackers: add `libjava' at the end of this list
-# for a merged tree build. This limitation and this comment will go
-# away when libjava will safely build without `--disable-new-gxx-abi'
-# (Soon.)
 TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib libio librx libstdc++ libg++ winsup opcodes bsp libstub cygmon libf2c libchill libobjc
 
 # Target libraries are put under this directory:
diff --git a/configure.in b/configure.in
index 4236fe075a4..362e672d7de 100644
--- a/configure.in
+++ b/configure.in
@@ -75,7 +75,6 @@ target_libs="target-libiberty \
 		target-libf2c \
 		target-libchill \
 		target-libffi \
-		target-libjava \
 		target-zlib \
 		target-boehm-gc \
 		target-qthreads \