diff --git a/.cvsignore b/.cvsignore
index 0a45dd3..1d393c5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,5 +2,5 @@ Xerces-J-src.2.6.2.tar.gz
 Xerces-J-tools.2.6.2.tar.gz
 XJavac.java
 xerces-2_6_2
-noarch
+i386
 *.src.rpm
diff --git a/xerces-j2.spec b/xerces-j2.spec
index 268a755..b043f27 100644
--- a/xerces-j2.spec
+++ b/xerces-j2.spec
@@ -31,7 +31,6 @@ BuildRequires:	jaxp_parser_impl
 BuildRequires:	xml-commons-resolver
 BuildRequires:	xml-commons-apis
 BuildRequires:  coreutils
-BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 # RHEL3 and FC2
 Obsoletes:	xerces-j <= 0:2.2
@@ -135,6 +134,7 @@ ant \
 	-Djar.resolver=xml-commons-resolver.jar \
 	clean jars javadocs
 
+nativify build/xercesImpl.jar build/lib%{name}.jar.so
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -144,6 +144,19 @@ mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p build/xercesImpl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
+# solibs
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+cp -p build/lib%{name}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}-%{version}.jar.so
+(cd $RPM_BUILD_ROOT%{_libdir} && for so in lib*-%{version}.jar.so; do ln -sf ${so} `echo $so| sed "s|-%{version}||g"`; done)
+
+# gcjdb
+gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
+mkdir -p $RPM_BUILD_ROOT$gcjdbdir
+gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db 80000
+gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \
+  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar \
+  %{_libdir}/lib%{name}-%{version}.jar.so
+
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-impl-%{version}
 cp -pr build/docs/javadocs/xerces2/* \
@@ -217,6 +230,7 @@ ln -s %{name}-xni-%{version} %{_javadocdir}/%{name}-xni
 %post
 update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
   jaxp_parser_impl %{_javadir}/%{name}.jar 40
+rebuild-gcj-db %{_libdir}
 
 %preun
 {
@@ -224,12 +238,16 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
   update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar
 } >/dev/null 2>&1 || :
 
+%postun
+rebuild-gcj-db %{_libdir}
 
 %files
 %defattr(0644,root,root,0755)
 %doc LICENSE README ISSUES STATUS TODO
 %{_javadir}/%{name}*.jar
 %ghost %{_javadir}/jaxp_parser_impl.jar
+%attr(0755,root,root) %{_libdir}/lib*.jar.so
+%{_libdir}/*/*/%{name}-%{version}.db
 
 %files javadoc-impl
 %defattr(0644,root,root,0755)
@@ -266,6 +284,9 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
 
 
 %changelog
+* Thu Apr 21 2005 Gary Benson <gbenson at redhat.com>
+- BC-compile.
+
 * Thu Apr 21 2005 Gary Benson <gbenson at redhat.com> 0:2.6.2-4jpp_2fc
 - Add classpath workaround to xjavac task (#152255).