diff --git a/jfreechart.spec b/jfreechart.spec
index 9a1f8c6..a415a02 100644
--- a/jfreechart.spec
+++ b/jfreechart.spec
@@ -6,7 +6,7 @@
 
 Name:           jfreechart
 Version:        1.0.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java chart library
 
 Group:          Development/Libraries
@@ -16,7 +16,7 @@ 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}
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
@@ -31,6 +31,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,20 +60,24 @@ 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
+ant -f ant/build.xml -Djcommon.jar=$(build-classpath jcommon) -Dservlet.jar=$(build-classpath servlet) compile javadoc
+ant -f ant/build-swt.xml -Dswt.jar=%{_libdir}/java/swt.jar -Djcommon.jar=$(build-classpath jcommon) -Djfreechart.jar=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 jfreechart-%{version}.jar  $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-%{version}.jar
+install -m 644 swtgraphics2d.jar  $RPM_BUILD_ROOT%{_javadir}/%{name}/swtgraphics2d-%{version}.jar
+install -m 644 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
@@ -90,19 +104,30 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_javadir}/*
+%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.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