diff --git a/.cvsignore b/.cvsignore
index 863c9e3..b96fbed 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-selenium-core-1.0.1.zip
-Test-WWW-Selenium-1.18.tar.gz
+Test-WWW-Selenium-1.21.tar.gz
diff --git a/perl-Test-WWW-Selenium.spec b/perl-Test-WWW-Selenium.spec
index ed9ecfd..1f80ccc 100644
--- a/perl-Test-WWW-Selenium.spec
+++ b/perl-Test-WWW-Selenium.spec
@@ -1,14 +1,11 @@
-%global selenium_version 1.0.1
-
 Name:           perl-Test-WWW-Selenium
-Version:        1.18
-Release:        2%{?dist}
+Version:        1.21
+Release:        1%{?dist}
 Summary:        Perl Client for the Selenium Remote Control test tool
 License:        (GPL+ or Artistic) and ASL 2.0
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Test-WWW-Selenium/
 Source0:        http://www.perl.org/authors/id/L/LU/LUKEC/Test-WWW-Selenium-%{version}.tar.gz
-Source1:        http://release.seleniumhq.org/selenium-core/%{selenium_version}/selenium-core-%{selenium_version}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -18,6 +15,8 @@ BuildRequires:  perl(Test::Mock::LWP)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(LWP::UserAgent)
 BuildRequires:  perl(URI::Escape) >= 1.31
+BuildRequires:  perl(CPAN)
+BuildRequires:  selenium-core
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -35,7 +34,7 @@ directly with the browser using AJAX (XmlHttpRequest).
 
 # Newer API definition
 mkdir -p target
-unzip -c %{SOURCE1} core/iedoc.xml >target/iedoc.xml
+unzip -c %{_datadir}/java/selenium-core.jar core/iedoc.xml >target/iedoc.xml
 
 
 %build
@@ -74,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 21 2010 Lubomir Rintel (Good Data) <lubo.rintel@gooddata.com> - 1.21-1
+- Newer release
+- use API definitions from packaged selenium-core
+
 * Fri Dec  4 2009 Stepan Kasal <skasal@redhat.com> - 1.18-2
 - rebuild against perl 5.10.1
 
diff --git a/sources b/sources
index 74d8602..be1cc6d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-31833c856b59a87cf7958a020bf6907c  selenium-core-1.0.1.zip
-0615263ba747894c63b0f96b3018620e  Test-WWW-Selenium-1.18.tar.gz
+dac6a88ecda017caabaefce578e14a11  Test-WWW-Selenium-1.21.tar.gz