diff --git a/.gitignore b/.gitignore
index 0fe8b55..fa988ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/Finance-Quote-1.20.tar.gz
+/Finance-Quote-[0-9.]*.tar.gz
diff --git a/FQ-requires.patch b/FQ-requires.patch
index 2bdd4d0..fe98096 100644
--- a/FQ-requires.patch
+++ b/FQ-requires.patch
@@ -1,7 +1,6 @@
-diff -up Finance-Quote-1.20/lib/Finance/Quote/Tiaacref.pm.foo Finance-Quote-1.20/lib/Finance/Quote/Tiaacref.pm
---- Finance-Quote-1.20/lib/Finance/Quote/Tiaacref.pm.foo	2014-02-25 10:02:24.197647363 -0500
-+++ Finance-Quote-1.20/lib/Finance/Quote/Tiaacref.pm	2014-02-25 10:02:51.556884032 -0500
-@@ -28,8 +28,7 @@
+--- lib/Finance/Quote/Tiaacref.pm
++++ lib/Finance/Quote/Tiaacref.pm
+@@ -29,8 +29,7 @@
  
  package Finance::Quote::Tiaacref;
  require 5.005;
@@ -11,15 +10,41 @@ diff -up Finance-Quote-1.20/lib/Finance/Quote/Tiaacref.pm.foo Finance-Quote-1.20
  
  use strict;
  
-diff -up Finance-Quote-1.20/META.yml.foo Finance-Quote-1.20/META.yml
---- Finance-Quote-1.20/META.yml.foo	2014-02-17 08:08:23.000000000 -0500
-+++ Finance-Quote-1.20/META.yml	2014-02-25 10:02:59.938956528 -0500
-@@ -30,7 +30,7 @@ requires:
-   HTTP::Request::Common: 0
-   JSON: 0
-   LWP::UserAgent: 0
--  Mozilla::CA: 0
-+  LWP::Protocol::https: 0
-   POSIX: 0
-   URI::Escape: 0
-   perl: 5.005
+--- Makefile.PL
++++ Makefile.PL
+@@ -38,7 +38,6 @@ my %WriteMakefileArgs = (
+     "JSON" => 0,
+     "LWP::Simple" => 0,
+     "LWP::UserAgent" => 0,
+-    "Mozilla::CA" => 0,
+     "POSIX" => 0,
+     "Storable" => 0,
+     "Time::Piece" => 0,
+@@ -85,7 +84,6 @@ my %FallbackPrereqs = (
+   "JSON" => 0,
+   "LWP::Simple" => 0,
+   "LWP::UserAgent" => 0,
+-  "Mozilla::CA" => 0,
+   "POSIX" => 0,
+   "Storable" => 0,
+   "Test" => 0,
+--- META.json
++++ META.json
+@@ -55,7 +55,6 @@
+             "JSON" : "0",
+             "LWP::Simple" : "0",
+             "LWP::UserAgent" : "0",
+-            "Mozilla::CA" : "0",
+             "POSIX" : "0",
+             "Storable" : "0",
+             "Time::Piece" : "0",
+--- META.yml
++++ META.yml
+@@ -46,7 +46,6 @@ requires:
+   JSON: '0'
+   LWP::Simple: '0'
+   LWP::UserAgent: '0'
+-  Mozilla::CA: '0'
+   POSIX: '0'
+   Storable: '0'
+   Time::Piece: '0'
diff --git a/perl-Finance-Quote.spec b/perl-Finance-Quote.spec
index 59baee6..1e4907c 100644
--- a/perl-Finance-Quote.spec
+++ b/perl-Finance-Quote.spec
@@ -1,42 +1,56 @@
-Name:		perl-Finance-Quote
-Version:        1.20
-Release: 	3%{?dist}
+Name:           perl-Finance-Quote
+Version:        1.35
+Release:        1%{?dist}
 Summary:        A Perl module that retrieves stock and mutual fund quotes
-Group:          Development/Libraries
 License:        GPLv2+
-URL:		http://finance-quote.sourceforge.net/
-Source0:	http://prdownloads.sourceforge.net/finance-quote/Finance-Quote-%{version}.tar.gz
-Patch1:		FQ-requires.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:            http://search.cpan.org/dist/Finance-Quote/
+Source0:        http://search.cpan.org/CPAN/authors/id/E/EC/ECOCODE/Finance-Quote-%{version}.tar.gz
+Patch1:         FQ-requires.patch
 BuildArch:      noarch
-Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-# because it doesn't get automatically added (#859607)
-Requires:       perl(LWP::Protocol::https)
-BuildRequires:  perl(inc::Module::Install)
+# Module Build
+BuildRequires:  perl >= 4:5.10.0
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.30
+# Module Runtime
 BuildRequires:  perl(base)
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(CGI)
-BuildRequires:	perl(Crypt::SSLeay)
-BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(constant)
+BuildRequires:  perl(Crypt::SSLeay)
 BuildRequires:  perl(Date::Calc)
 BuildRequires:  perl(Encode)
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(HTML::Parser)
-BuildRequires:	perl(HTML::TableExtract)
+BuildRequires:  perl(HTML::TableExtract)
+BuildRequires:  perl(HTML::TokeParser)
 BuildRequires:  perl(HTML::TreeBuilder)
+BuildRequires:  perl(HTTP::Cookies)
 BuildRequires:  perl(HTTP::Headers)
-BuildRequires:  perl(LWP::Protocol::https)
 BuildRequires:  perl(HTTP::Request::Common)
 BuildRequires:  perl(HTTP::Status)
 BuildRequires:  perl(JSON)
 BuildRequires:  perl(LWP::Simple)
-BuildRequires:	perl(LWP::UserAgent)
+BuildRequires:  perl(LWP::UserAgent)
+BuildRequires:  perl(POSIX)
+BuildRequires:  perl(Storable)
+BuildRequires:  perl(strict)
+BuildRequires:  perl(Time::Piece)
 BuildRequires:  perl(URI)
+BuildRequires:  perl(URI::Escape)
 BuildRequires:  perl(URI::QueryParam)
-# Tests
-# Required for compile tests; no 'online' tests are run during the build
+BuildRequires:  perl(utf8)
+BuildRequires:  perl(vars)
+BuildRequires:  perl(warnings)
+# Test Suite
+BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(File::Spec)
-BuildRequires:	perl(Test::More)
+BuildRequires:  perl(Test)
+BuildRequires:  perl(Test::More)
+# Runtime
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+
+# Make sure we have SSL support for LWP (#859607)
+BuildRequires:  perl(LWP::Protocol::https)
+Requires:       perl(LWP::Protocol::https)
 
 %description
 This module retrieves stock and mutual fund quotes from various exchanges
@@ -44,33 +58,91 @@ using various source.
 
 %prep
 %setup -q -n Finance-Quote-%{version} 
-%patch1 -p1
-find . -name *.pm | xargs %{__sed} -i -e '/^#!.*\/usr\/bin\/perl/d'
+
+# Use LWP::Protocol::https rather than Mozilla::CA for EL-6
+%patch1
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+%{_fixperms} %{buildroot}
 
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
-%doc ChangeLog* Documentation/*
+%if 0%{?_licensedir:1}
+%license LICENSE
+%else
+%doc LICENSE
+%endif
+%doc Change* Documentation/*
 %{perl_vendorlib}/Finance/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/Finance::Quote.3*
+%{_mandir}/man3/Finance::Quote::AEX.3*
+%{_mandir}/man3/Finance::Quote::AIAHK.3*
+%{_mandir}/man3/Finance::Quote::ASEGR.3*
+%{_mandir}/man3/Finance::Quote::ASX.3*
+%{_mandir}/man3/Finance::Quote::BMONesbittBurns.3*
+%{_mandir}/man3/Finance::Quote::BSERO.3*
+%{_mandir}/man3/Finance::Quote::Bourso.3*
+%{_mandir}/man3/Finance::Quote::CSE.3*
+%{_mandir}/man3/Finance::Quote::Cdnfundlibrary.3*
+%{_mandir}/man3/Finance::Quote::Citywire.3*
+%{_mandir}/man3/Finance::Quote::Cominvest.3*
+%{_mandir}/man3/Finance::Quote::Currencies.3*
+%{_mandir}/man3/Finance::Quote::DWS.3*
+%{_mandir}/man3/Finance::Quote::Deka.3*
+%{_mandir}/man3/Finance::Quote::FTPortfolios.3*
+%{_mandir}/man3/Finance::Quote::FTfunds.3*
+%{_mandir}/man3/Finance::Quote::Fidelity.3*
+%{_mandir}/man3/Finance::Quote::FinanceCanada.3*
+%{_mandir}/man3/Finance::Quote::Finanzpartner.3*
+%{_mandir}/man3/Finance::Quote::Fool.3*
+%{_mandir}/man3/Finance::Quote::GoldMoney.3*
+%{_mandir}/man3/Finance::Quote::HEX.3*
+%{_mandir}/man3/Finance::Quote::HU.3*
+%{_mandir}/man3/Finance::Quote::IndiaMutual.3*
+%{_mandir}/man3/Finance::Quote::LeRevenu.3*
+%{_mandir}/man3/Finance::Quote::MStaruk.3*
+%{_mandir}/man3/Finance::Quote::ManInvestments.3*
+%{_mandir}/man3/Finance::Quote::Morningstar.3*
+%{_mandir}/man3/Finance::Quote::MorningstarJP.3*
+%{_mandir}/man3/Finance::Quote::MtGox.3*
+%{_mandir}/man3/Finance::Quote::NZX.3*
+%{_mandir}/man3/Finance::Quote::Platinum.3*
+%{_mandir}/man3/Finance::Quote::SEB.3*
+%{_mandir}/man3/Finance::Quote::TNetuk.3*
+%{_mandir}/man3/Finance::Quote::TSP.3*
+%{_mandir}/man3/Finance::Quote::TSX.3*
+%{_mandir}/man3/Finance::Quote::Tdefunds.3*
+%{_mandir}/man3/Finance::Quote::Tdwaterhouse.3*
+%{_mandir}/man3/Finance::Quote::Tiaacref.3*
+%{_mandir}/man3/Finance::Quote::Troweprice.3*
+%{_mandir}/man3/Finance::Quote::Trustnet.3*
+%{_mandir}/man3/Finance::Quote::USFedBonds.3*
+%{_mandir}/man3/Finance::Quote::Union.3*
+%{_mandir}/man3/Finance::Quote::VWD.3*
+%{_mandir}/man3/Finance::Quote::Yahoo::Asia.3*
+%{_mandir}/man3/Finance::Quote::Yahoo::Australia.3*
+%{_mandir}/man3/Finance::Quote::Yahoo::Base.3*
+%{_mandir}/man3/Finance::Quote::Yahoo::Brasil.3*
+%{_mandir}/man3/Finance::Quote::Yahoo::Europe.3*
+%{_mandir}/man3/Finance::Quote::Yahoo::NZ.3*
+%{_mandir}/man3/Finance::Quote::Yahoo::USA.3*
+%{_mandir}/man3/Finance::Quote::YahooJSON.3*
+%{_mandir}/man3/Finance::Quote::ZA.3*
+%{_mandir}/man3/Finance::Quote::ZA_UnitTrusts.3*
 
 %changelog
+* Tue Nov 18 2014 Paul Howarth <paul@city-fan.org> - 1.35-1
+- Update to 1.35
+- Clean up and modernize spec somewhat
+
 * Tue Feb 25 2014 Bill Nottingham <notting@redhat.com> - 1.20-3
 - tweak requires (#1069717)
 
diff --git a/sources b/sources
index 95d0015..1471e37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1cc20330f383a780685ed72e1b286606  Finance-Quote-1.20.tar.gz
+c81980d5266d94e51ce83f94a3315261  Finance-Quote-1.35.tar.gz