diff --git a/jai-imageio-core.spec b/jai-imageio-core.spec
index 403373e..1e65253 100644
--- a/jai-imageio-core.spec
+++ b/jai-imageio-core.spec
@@ -1,10 +1,8 @@
-%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-
 %global cvs_ver 20100217
 
 Name:		jai-imageio-core
 Version:	1.2
-Release:	0.7.%{cvs_ver}cvs%{?dist}
+Release:	0.9.%{cvs_ver}cvs%{?dist}
 Summary:	Core Java Advanced Imaging Image I/O Tools API
 
 Group:		System Environment/Libraries
@@ -25,9 +23,7 @@ Source1:	README-fedora-epel.txt
 # ./generate-tarball.sh USERNAME DATE
 Source2:	generate-tarball.sh
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	java-devel libgcj-devel ant jpackage-utils
+BuildRequires:	java-devel ant jpackage-utils
 BuildRequires:	recode
 Requires:	java jpackage-utils
 
@@ -38,15 +34,7 @@ Patch2:		jai-imageio-core-remove-jai-operations.patch
 Patch3:		jai-imageio-core-remove-jpeg2000-plugin.patch
 Patch4:		jai-imageio-core-no-sun-classes.patch
 
-
-%if %{with_gcj}
-BuildRequires:	java-gcj-compat-devel >= 1.0.31
-Requires(post):	java-gcj-compat >= 1.0.31
-Requires(postun):		java-gcj-compat >= 1.0.31
-%else
 BuildArch:	noarch
-%endif
-
 
 %description
 This package contains the core Java Advanced Imaging Image I/O Tools API,
@@ -58,7 +46,6 @@ Summary:	Javadocs for %{name}
 Group:		Documentation
 Requires:	%{name} = %{version}-%{release}
 Requires:	jpackage-utils
-BuildArch:	noarch
 
 
 %description javadoc
@@ -95,57 +82,26 @@ ant -DBUILD_TARGET=linux-i586 jar-opt docs-jcp
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-cp -av build/linux-i586/opt/lib/ext/jai_imageio.jar $RPM_BUILD_ROOT%{_javadir}/jai_imageio-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+cp -av build/linux-i586/opt/lib/ext/jai_imageio.jar $RPM_BUILD_ROOT%{_javadir}/jai_imageio.jar
 
 cp -av build/linux-i586/javadocs/docs-jcp/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{with_gcj}
-%{_bindir}/aot-compile-rpm
-%endif
-
-
-%if %{with_gcj}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-%{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-
-%if %{with_gcj}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-%{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt COPYRIGHT.txt README-fedora-epel.txt
 %{_javadir}/*.jar
 
-%if %{with_gcj}
-%{_libdir}/gcj/%{name}
-%endif
-
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 
 %changelog
+* Thu Apr 12 2012 Alexander Kurtakov <akurtako@redhat.com> 1.2-0.9.20100217cvs
+- Drop gcj_support.
+- Adapt to current guidelines.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-0.7.20100217cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild