diff --git a/avalon-framework.spec b/avalon-framework.spec
index 59e56a7..5fe1193 100644
--- a/avalon-framework.spec
+++ b/avalon-framework.spec
@@ -28,21 +28,18 @@
 # 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}}}
-%define short_name    framework
-%define short_Name    Avalon
+%global short_name    framework
+%global short_Name    Avalon
 
 Name:        avalon-%{short_name}
 Version:     4.1.4
-Release:     6%{?dist}
+Release:     7%{?dist}
 Epoch:       0
 Summary:     Java components interfaces
 License:     ASL 1.1
-Url:         http://avalon.apache.org/%{short_name}/
-Group:       Development/Libraries/Application Frameworks
-Source0:     http://www.apache.org/dist/avalon/framework/v4.1.4/Avalon-4.1.4-src.tar.gz
+URL:         http://avalon.apache.org/%{short_name}/
+Group:       Development/Libraries
+Source0:     http://archive.apache.org/dist/avalon/avalon-framework/v4.1.4/Avalon-4.1.4-src.tar.gz
 Patch1:        %{name}-target.patch
 Requires:    xml-commons-apis >= 1.3
 Requires:    xalan-j2
@@ -51,16 +48,7 @@ BuildRequires:    junit
 BuildRequires:    avalon-logkit
 BuildRequires:    xml-commons-apis >= 1.3
 BuildRequires:    jpackage-utils >= 0:1.5
-%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
 The Avalon framework consists of interfaces that define relationships
@@ -73,16 +61,14 @@ ancestors and children.
 
 %package manual
 Summary:      Manual for %{name}
-Group:        Development/Libraries/Application Frameworks
+Group:        Documentation
 
 %description manual
 Documentation for %{name}.
 
 %package javadoc
 Summary:      Javadoc for %{name}
-Group:        Development/Documentation
-Requires(post):  /bin/rm /bin/ln
-Requires(postun): /bin/rm
+Group:        Documentation
 
 %description javadoc
 Javadoc for %{name}.
@@ -111,55 +97,33 @@ ant -Dfailonerror=false javadocs
 rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-install -m 644 target/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 target/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 cp -pr target/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-# create unversioned symlinks
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
 
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%if %{gcj_support}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc KEYS LICENSE.txt README.txt
 %{_javadir}/*.jar
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/avalon-framework-4.1.4.jar.*
-%endif
-
 %files manual
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc docs/*
 
 %files javadoc
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Dec 29 2010 Alexander Kurtakov <akurtako@redhat.com> 0:4.1.4-7
+- Drop gcj.
+- Use global.
+- No versioned jars.
+- Fix permissions.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.1.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild