diff --git a/adaptx.spec b/adaptx.spec
index cf59f27..87ab372 100644
--- a/adaptx.spec
+++ b/adaptx.spec
@@ -28,13 +28,9 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
 Name:          adaptx
 Version:       0.9.13
-Release:       9%{?dist}
+Release:       10%{?dist}
 Summary:       AdaptX XSLT processor and XPath engine
 License:       BSD
 Group:         Applications/Text
@@ -46,8 +42,9 @@ Patch0:        %{name}-%{version}-xsl.patch
 Patch1:        %{name}-%{version}-missingstubs.patch
 Patch2:        %{name}-%{version}-build-xml.patch
 Patch3:        adaptx-0.9.13-no-enum-as-identifier.patch
-Url:           http://castor.codehaus.org/
+URL:           http://castor.codehaus.org/
 BuildRequires: ant >= 0:1.6
+BuildRequires: ant-nodeps
 BuildRequires: jpackage-utils >= 0:1.6
 BuildRequires: log4j
 BuildRequires: xml-commons-apis
@@ -58,16 +55,7 @@ Requires:      xerces-j2
 Requires:      jpackage-utils
 Requires(pre):    jpackage-utils
 Requires(postun): jpackage-utils
-%if ! %{gcj_support}
 BuildArch:    noarch
-%endif
-BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%if %{gcj_support}
-BuildRequires:    java-gcj-compat-devel
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
 
 %description
 Adaptx is an XSLT processor and XPath engine.
@@ -76,8 +64,6 @@ Adaptx is an XSLT processor and XPath engine.
 Group:            Documentation
 Summary:          Javadoc for %{name}
 Requires:         jpackage-utils
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -115,63 +101,31 @@ rm -rf $RPM_BUILD_ROOT
 
 # jar
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/%{name}_%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} ${jar/-%{version}/}; done)
+install -m 644 dist/%{name}_%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 rm -rf build/doc/javadoc
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
-fi
-
-%post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
 %files
-%defattr(0664,root,root,0755)
+%defattr(-,root,root,-)
 %doc src/etc/{CHANGELOG,contributors.html,LICENSE}
 %{_javadir}/*
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
-
 %files javadoc
-%defattr(0664,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}
 
 %files doc
-%defattr(0664,root,root,0755)
+%defattr(-,root,root,-)
 %doc build/doc/*
 
 %changelog
+* Tue Dec 21 2010 Alexander Kurtakov <akurtako@redhat.com> 0.9.13-10
+- Fix FTBFS.
+- Drop gcj.
+- Adapt to current guidelines.
+
 * Thu Mar 11 2010 Peter Lemenkov <lemenkov@gmail.com> - 0.9.13-9
 - Added missing requires jpackage-utils