diff --git a/gcc.changes b/gcc.changes
index 2c168b4..def500e 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 24 11:14:03 CEST 2007 - rguenther@suse.de
+
+- Add 32bit and 64bit variants of gcc-gij.  [#293423]
+
 -------------------------------------------------------------------
 Fri Jul  6 15:10:24 CEST 2007 - rguenther@suse.de
 
diff --git a/gcc.spec b/gcc.spec
index 6c6864c..52089a4 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -24,7 +24,7 @@ URL:            http://gcc.gnu.org/
 %define gcc_suffix 4.2
 License:        GPL v2 or later
 Version:        4.2
-Release:        7
+Release:        11
 Group:          Development/Languages/C and C++
 Summary:        The system GNU C Compiler
 Provides:       c_compiler
@@ -219,6 +219,25 @@ The system GNU Java bytecode interpreter.
 
 
 
+%package -n gcc-gij-32bit
+Group:          Development/Languages/Java
+Summary:        The system GNU Java bytecode interpreter
+Requires:       gcc%{gcc_version}-gij-32bit
+
+%description -n gcc-gij-32bit
+The system GNU Java bytecode interpreter.
+
+
+%package -n gcc-gij-64bit
+Group:          Development/Languages/Java
+Summary:        The system GNU Java bytecode interpreter
+Requires:       gcc%{gcc_version}-gij-64bit
+
+%description -n gcc-gij-64bit
+The system GNU Java bytecode interpreter.
+
+
+
 %package -n gcc-objc
 Group:          Development/Languages/Other
 Summary:        The system GNU Objective C Compiler
@@ -337,6 +356,12 @@ for program in \
         g++ \
         cpp \
         gcj gcjh gij gjnih gcj-dbtool jcf-dump jv-convert jv-scan \
+%if %{separate_bi32}
+	gij32 grmiregistry32 \
+%endif
+%if %{separate_bi64}
+	gij64 grmiregistry62 \
+%endif
         gfortran \
 	gnat gnatbind gnatbl gnatchop gnatclean gnatfind gnatkr \
 	gnatlink gnatls gnatmake gnatname gnatprep gnatxref gprmake \
@@ -478,6 +503,11 @@ ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
 # empty - only for the dependency
 %doc README
 
+%files -n gcc-gij-32bit
+%defattr(-,root,root)
+%{_prefix}/bin/gij32
+%{_prefix}/bin/grmiregistry32
+
 %files -n libffi-devel-32bit
 %defattr(-,root,root)
 # empty - only for the dependency
@@ -500,6 +530,11 @@ ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
 # empty - only for the dependency
 %doc README
 
+%files -n gcc-gij-64bit
+%defattr(-,root,root)
+%{_prefix}/bin/gij64
+%{_prefix}/bin/grmiregistry64
+
 %files -n libffi-devel-64bit
 %defattr(-,root,root)
 # empty - only for the dependency
@@ -507,6 +542,8 @@ ln -sf gcc-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/cc.1.gz
 %endif
 
 %changelog
+* Tue Jul 24 2007 - rguenther@suse.de
+- Add 32bit and 64bit variants of gcc-gij.  [#293423]
 * Fri Jul 06 2007 - rguenther@suse.de
 - Mark ppc64 as separate bi-32.
 * Thu Jun 14 2007 - ro@suse.de