diff --git a/.cvsignore b/.cvsignore
index f23aa86..d33e3b5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-jfreechart-1.0.10.tar.gz
+jfreechart-1.0.13.tar.gz
diff --git a/import.log b/import.log
index 5796f59..08dc9f2 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 jfreechart-1_0_10-1_el5:EL-5:jfreechart-1.0.10-1.el5.src.rpm:1216750794
+jfreechart-1_0_13-1_fc14:EL-5:jfreechart-1.0.13-1.fc14.src.rpm:1278560473
diff --git a/jfreechart.spec b/jfreechart.spec
index f37c628..b24175f 100644
--- a/jfreechart.spec
+++ b/jfreechart.spec
@@ -1,11 +1,10 @@
 # TODO: junit QA tests
 
 # These do fail to link, disabling them
-#define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-%define with_gcj 0
+%bcond_with gcj
 
 Name:           jfreechart
-Version:        1.0.10
+Version:        1.0.13
 Release:        1%{?dist}
 Summary:        Java chart library
 
@@ -16,9 +15,9 @@ Source0:        http://download.sourceforge.net/sourceforge/jfreechart/%{name}-%
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       servlet jcommon java jpackage-utils
-BuildRequires:  %{requires} ant java-devel
+BuildRequires:  %{requires} ant java-devel eclipse-swt
 
-%if %{with_gcj}
+%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
@@ -31,6 +30,16 @@ JFreeChart is a free 100% Java chart library that makes it easy for
 developers to display professional quality charts in their applications.
 
 
+%package swt
+Summary:        Experimental swt extension for jfreechart
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       eclipse-swt jpackage-utils
+
+%description swt
+Experimental swt extension for jfreechart.
+
+
 %package javadoc
 Summary:        Javadocs for %{name}
 Group:          Documentation
@@ -50,36 +59,45 @@ This package contains the API documentation for %{name}.
 find \( -name '*.jar' -o -name '*.class' \) -exec rm -f '{}' \;
 
 # Build
-cd ant
-ant -Djcommon.jar=$(build-classpath jcommon) -Dservlet.jar=$(build-classpath servlet) compile javadoc
+CLASSPATH=$(build-classpath jcommon servlet) \
+        ant -f ant/build.xml \
+        compile javadoc
+ant -f ant/build-swt.xml \
+        -Dswt.jar=%{_libdir}/java/swt.jar \
+        -Djcommon.jar=$(build-classpath jcommon) \
+        -Djfreechart.jar=lib/jfreechart-%{version}.jar
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # Directory structure
-install -d $RPM_BUILD_ROOT%{_javadir}
+install -d $RPM_BUILD_ROOT%{_javadir}/%{name}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # JARs and JavaDoc
-install -m 644 jfreechart-%{version}.jar  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m 644 lib/jfreechart-%{version}.jar  $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-%{version}.jar
+install -m 644 lib/swtgraphics2d.jar  $RPM_BUILD_ROOT%{_javadir}/%{name}/swtgraphics2d-%{version}.jar
+install -m 644 lib/jfreechart-%{version}-swt.jar  $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-swt-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}.jar
+ln -s swtgraphics2d-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/swtgraphics2d.jar
+ln -s %{name}-swt-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-swt.jar
 cp -rp javadoc/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # GCJ AOT bits
-%if %{with_gcj}
+%if %with gcj
 %{_bindir}/aot-compile-rpm
 %endif
 
 
+%if %with gcj
 %post
-%if %{with_gcj}
 [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db
 %endif
 
 
+%if %with gcj
 %postun
-%if %{with_gcj}
 [ -x %{_bindir}/rebuild-gcj-db ] && %{_bindir}/rebuild-gcj-db
 %endif
 
@@ -90,18 +108,39 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_javadir}/*
-%if %{with_gcj}
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/%{name}.jar
+%{_javadir}/%{name}/%{name}-%{version}.jar
+%if %with gcj
 %{_libdir}/gcj/%{name}
 %endif
 %doc ChangeLog licence-LGPL.txt NEWS README.txt
 
 
+%files swt
+%defattr(-,root,root,-)
+%{_javadir}/%{name}/swtgraphics2d*.jar
+%{_javadir}/%{name}/%{name}-swt*.jar
+
+
 %files javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 
 %changelog
+* Mon Apr 19 2010 Lubomir Rintel <lkundrak@v3.sk> - 1.0.13-1
+- Update to a later release
+- Cosmetic fixes
+
+* Mon Apr 19 2010 Lubomir Rintel <lkundrak@v3.sk> - 1.0.10-4
+- Enable SWT support (ELMORABITY Mohamed, #583339)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Jul 19 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak@fedoraproject.org> - 1.0.10-1
 - Initial packaging
diff --git a/sources b/sources
index d9f4862..7ad77c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c903dbef8283961ee8b58355a4a9b18  jfreechart-1.0.10.tar.gz
+c90e2f8f612b9aaf3f24a4afce219076  jfreechart-1.0.13.tar.gz