diff --git a/cpp b/cpp
index 0b86179..6f233ca 100644
--- a/cpp
+++ b/cpp
@@ -1,3 +1,4 @@
 #!/bin/sh
-# Traditionally, /lib/cpp only knew about C
-exec /usr/bin/cpp -xc "$@"
+# Traditionally, /lib/cpp only knew about C.
+# Also supress GCC and target specific defines and be more permissive.
+exec /usr/bin/cpp -xc -traditional-cpp -undef "$@"
diff --git a/gcc.changes b/gcc.changes
index db9ba1c..c4b77ba 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Nov 16 16:15:54 CET 2007 - rguenther@suse.de
+
+- For now disable symlinking of binaries and manpages that
+  conflict with the classpath package.
+
+-------------------------------------------------------------------
+Tue Nov 13 14:38:25 CET 2007 - rguenther@suse.de
+
+- Make /lib/cpp traditional and avoid GCC and target specific
+  defines.
+
 -------------------------------------------------------------------
 Tue Oct 30 11:19:36 CET 2007 - rguenther@suse.de
 
diff --git a/gcc.spec b/gcc.spec
index efc1145..74b76fe 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -24,7 +24,7 @@ Url:            http://gcc.gnu.org/
 %define gcc_suffix 4.3
 License:        GPL v2 or later
 Version:        4.3
-Release:        3
+Release:        6
 Group:          Development/Languages/C and C++
 Summary:        The system GNU C Compiler
 Provides:       c_compiler
@@ -352,19 +352,29 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/doc/packages/gcc-objc/
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/doc/packages/gcc-obj-c++/
 # Link all the binaries
+# XXX gjavah
 for program in \
         gcc gcov \
         g++ \
         cpp \
 	gcj jcf-dump \
-	gappletviewer gc-analyze gcj-dbtool gcjh gij \
+	gc-analyze gcj-dbtool gcjh gij jv-convert \
+%if 0
+	gappletviewer \
 	gjar gjarsigner gjavah gkeytool gnative2ascii gorbd grmic \
-	grmid grmiregistry gserialver gtnameserv jv-convert \
+	grmid grmiregistry gserialver gtnameserv \
+%endif
 %if %{separate_bi32}
-	gij32 grmiregistry32 \
+%if 0
+	grmiregistry32 \
+%endif
+	gij32 \
 %endif
 %if %{separate_bi64}
-	gij64 grmiregistry64 \
+%if 0
+	grmiregistry64 \
+%endif
+	gij64 \
 %endif
         gfortran \
 	gnat gnatbind gnatbl gnatchop gnatclean gnatfind gnatkr \
@@ -373,15 +383,18 @@ for program in \
   ln -sf $program-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/$program
 done
 # Link section 1 manpages
+# XXX gjavah
 for man1 in \
         gcc gcov \
         g++ \
         cpp \
         gfortran \
-	gcj jcf-dump \
-	gappletviewer gc-analyze gcj-dbtool gij gjar gjarsigner gjavah \
+	gcj jcf-dump gc-analyze gcj-dbtool gij \
+%if 0
+	gappletviewer gjar gjarsigner gjavah \
 	gkeytool gnative2ascii gorbd grmic grmid grmiregistry gserialver \
 	gtnameserv \
+%endif
     ; do
   ln -sf $man1-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/$man1.1.gz
 done
@@ -430,11 +443,13 @@ ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
 
 %files -n gcc-gij
 %defattr(-,root,root)
-%{_prefix}/bin/gappletviewer
 %{_prefix}/bin/gc-analyze
 %{_prefix}/bin/gcj-dbtool
 %{_prefix}/bin/gcjh
 %{_prefix}/bin/gij
+%{_prefix}/bin/jv-convert
+%if 0
+%{_prefix}/bin/gappletviewer
 %{_prefix}/bin/gjar
 %{_prefix}/bin/gjarsigner
 %{_prefix}/bin/gjavah
@@ -446,11 +461,12 @@ ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
 %{_prefix}/bin/grmiregistry
 %{_prefix}/bin/gserialver
 %{_prefix}/bin/gtnameserv
-%{_prefix}/bin/jv-convert
-%doc %{_mandir}/man1/gappletviewer.1.gz
+%endif
 %doc %{_mandir}/man1/gc-analyze.1.gz
 %doc %{_mandir}/man1/gcj-dbtool.1.gz
 %doc %{_mandir}/man1/gij.1.gz
+%if 0
+%doc %{_mandir}/man1/gappletviewer.1.gz
 %doc %{_mandir}/man1/gjar.1.gz
 %doc %{_mandir}/man1/gjarsigner.1.gz
 %doc %{_mandir}/man1/gjavah.1.gz
@@ -462,6 +478,7 @@ ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
 %doc %{_mandir}/man1/grmiregistry.1.gz
 %doc %{_mandir}/man1/gserialver.1.gz
 %doc %{_mandir}/man1/gtnameserv.1.gz
+%endif
 
 %files -n gcc-objc
 %defattr(-,root,root)
@@ -534,7 +551,9 @@ ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
 %files -n gcc-gij-32bit
 %defattr(-,root,root)
 %{_prefix}/bin/gij32
+%if 0
 %{_prefix}/bin/grmiregistry32
+%endif
 
 %files -n libffi-devel-32bit
 %defattr(-,root,root)
@@ -561,14 +580,23 @@ ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
 %files -n gcc-gij-64bit
 %defattr(-,root,root)
 %{_prefix}/bin/gij64
+%if 0
 %{_prefix}/bin/grmiregistry64
+%endif
 
 %files -n libffi-devel-64bit
 %defattr(-,root,root)
 # empty - only for the dependency
 %doc README
 %endif
+
 %changelog
+* Fri Nov 16 2007 - rguenther@suse.de
+- For now disable symlinking of binaries and manpages that
+  conflict with the classpath package.
+* Tue Nov 13 2007 - rguenther@suse.de
+- Make /lib/cpp traditional and avoid GCC and target specific
+  defines.
 * Tue Oct 30 2007 - rguenther@suse.de
 - Add gcc-gij dependency to gcc-java as it contains many of the
   tools formerly packaged in the gcc-java package.