diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index b90953feb5..37bcd8ae44 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-12	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* gcc3newlib/gccnewlib.add: Default to not building gcj for all gcc
+	versions. Cleanup comments.
+
 2005-04-12	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* configure.ac, setup, setup.def, gcc3newlib/mkspec.in:
diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add
index 21af5572ca..b36bc1fc14 100644
--- a/scripts/gcc3newlib/gccnewlib.add
+++ b/scripts/gcc3newlib/gccnewlib.add
@@ -48,22 +48,13 @@ BuildPreReq:	%{rpmprefix}%{gcc_target}-binutils
 # those targets wanting to support ada.
 
 # default to not building gnat
-# gcc-3.3: Doesn't support cross-building gnatlib
-# gcc-3.4.0: Doesn't support cross-build gnattools
-# gcc-4.0.0: Doesn't support newlib
 %define _gnat	%{?gnat:%gnat}%{!?gnat:0}
 
 # Use rpm -ba --define 'gcj [0|1]' xxx.spec to override building gcj for 
 # those targets wanting to support gcj.
 
-%if "%{gcc_version}" >= "3.4"
-# default to building gcj
-%define _gcj	%{?gcj:%gcj}%{!?gcj:1}
-%else
 # default to not building gcj
 %define _gcj	%{?gcj:%gcj}%{!?gcj:0}
-%endif
-
 
 %define build_cxx 	%{?cxx:%cxx}%{!?cxx:1}
 %define build_g77 	%{?g77:%g77}%{!?g77:0}