diff --git a/jdom.spec b/jdom.spec
index 50894b7..7ff6179 100644
--- a/jdom.spec
+++ b/jdom.spec
@@ -28,20 +28,14 @@
 # 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 section free
-
 Name:           jdom
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Java alternative to DOM and SAX
-License:        BSD
+License:        ASL
 URL:            http://www.jdom.org/
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 Source0:        http://jdom.org/dist/binary/jdom-1.1.1.tar.gz
 Source1:        http://repo1.maven.org/maven2/org/jdom/jdom/1.1/jdom-1.1.pom
 Patch0:         %{name}-crosslink.patch
@@ -53,16 +47,10 @@ BuildRequires:  ant >= 0:1.6
 BuildRequires:  xalan-j2 >= 0:2.2.0
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  java-javadoc
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-
-%if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
-%endif
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+Requires:       jpackage-utils
 
 %description
 JDOM is, quite simply, a Java representation of an XML document. JDOM
@@ -74,20 +62,16 @@ and SAX.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-BuildArch:      noarch
-# for /bin/rm and /bin/ln
-Requires(post):   coreutils
-Requires(postun): coreutils
+Group:          Documentation
+Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
 
 %package demo
 Summary:        Demos for %{name}
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 Requires:       %{name} = %{epoch}:%{version}-%{release}
-BuildArch:      noarch
 
 %description demo
 Demonstrations and samples for %{name}.
@@ -131,67 +115,41 @@ mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
 cp jdom-1.1.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-jdom.pom
 %add_to_maven_depmap org.jdom %{name} %{version} JPP %{name}
 
-
-%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
 %update_maven_depmap
-%if %{gcj_support}
-  if [ -x %{_bindir}/rebuild-gcj-db ] 
-  then
-    %{_bindir}/rebuild-gcj-db
-  fi
-%endif
 
 %postun
 %update_maven_depmap
-%if %{gcj_support}
-  if [ -x %{_bindir}/rebuild-gcj-db ] 
-  then
-    %{_bindir}/rebuild-gcj-db
-  fi
-%endif
-
 
 %files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
 %{_javadir}/%{name}*.jar
 %{_mavendepmapfragdir}/%{name}
 %{_mavenpomdir}/*.pom
 
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
-
 %files javadoc
-%defattr(0644,root,root,0755)
-%ghost %doc %{_javadocdir}/%{name}
-%doc %{_javadocdir}/%{name}-%{version}
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}
+%{_javadocdir}/%{name}-%{version}
+%doc LICENSE.txt
 
 %files demo
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %{_datadir}/%{name}
-
+%doc LICENSE.txt
 
 %changelog
-* Fri Feb  5 2010 Mary Ellen Foster <mefoster at gmail.com> 1.1.1-1
-- Update to 1.1.1
+* Mon Nov 1 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.1.1-2
+- Drop gcj support.
+- Fix license tag.
+- Fix requires and build requires.
+
+* Fri Feb 5 2010 Mary Ellen Foster <mefoster at gmail.com> 0:1.1.1-1
+- Update to 1.1.1 bug#316380
 - Add maven dependency information
 - Make javadoc and demo subpackages noarch