diff --git a/gcc.changes b/gcc.changes
index cfc863c..87fce95 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 24 18:35:21 CEST 2007 - rguenther@suse.de
+
+- Do not link to grmic and grmiregistry, they conflict with
+  the classpath package versions.
+
 -------------------------------------------------------------------
 Tue Jan 16 17:05:32 CET 2007 - rguenther@suse.de
 
diff --git a/gcc.spec b/gcc.spec
index 679887d..4f22fb8 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -24,7 +24,7 @@ URL:            http://gcc.gnu.org/
 %define gcc_suffix 4.1
 License:        GNU General Public License (GPL)
 Version:        4.1.3
-Release:        33
+Release:        44
 Group:          Development/Languages/C and C++
 Summary:        The system GNU C Compiler
 Provides:       c_compiler
@@ -336,7 +336,7 @@ for program in \
         gcc gcov \
         g++ \
         cpp \
-        gcj gcjh gij gjnih gcj-dbtool grmic grmiregistry jcf-dump jv-convert jv-scan \
+        gcj gcjh gij gjnih gcj-dbtool jcf-dump jv-convert jv-scan \
         gfortran \
 	gnat gnatbind gnatbl gnatchop gnatclean gnatfind gnatkr \
 	gnatlink gnatls gnatmake gnatname gnatprep gnatxref gprmake \
@@ -349,7 +349,7 @@ for man1 in \
         g++ \
         cpp \
         gfortran \
-        gcj gcjh gjnih jcf-dump jv-scan gcj-dbtool gij grmic grmiregistry \
+        gcj gcjh gjnih jcf-dump jv-scan gcj-dbtool gij \
     ; do
   ln -sf $man1-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/$man1.1.gz
 done
@@ -406,13 +406,9 @@ ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
 %defattr(-,root,root)
 %{_prefix}/bin/gcj-dbtool
 %{_prefix}/bin/gij
-%{_prefix}/bin/grmic
-%{_prefix}/bin/grmiregistry
 %{_prefix}/bin/jv-convert
 %doc %{_mandir}/man1/gcj-dbtool.1.gz
 %doc %{_mandir}/man1/gij.1.gz
-%doc %{_mandir}/man1/grmic.1.gz
-%doc %{_mandir}/man1/grmiregistry.1.gz
 
 %files -n gcc-objc
 %defattr(-,root,root)
@@ -510,7 +506,10 @@ ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
 %doc README
 %endif
 
-%changelog -n gcc
+%changelog
+* Tue Apr 24 2007 - rguenther@suse.de
+- Do not link to grmic and grmiregistry, they conflict with
+  the classpath package versions.
 * Tue Jan 16 2007 - rguenther@suse.de
 - Do not mark README.packaging as NoSource.
 * Thu Nov 09 2006 - rguenther@suse.de