diff --git a/perl-SQL-Translator.spec b/perl-SQL-Translator.spec
index 314ffed..62d3190 100644
--- a/perl-SQL-Translator.spec
+++ b/perl-SQL-Translator.spec
@@ -22,12 +22,12 @@ License:        GPL-2.0+
 Group:          Development/Libraries/Perl
 Version:        0.11010
 Release:        0
-Url:            http://search.cpan.org/dist/SQL-Translator/
-Source:         http://www.cpan.org/authors/id/R/RI/RIBASUSHI/SQL-Translator-%{version}.tar.gz
 Patch1:         sqlite.patch
+%{perl_requires}
+Url:            http://search.cpan.org/dist/SQL-Translator/
+Source:         http://www.cpan.org/authors/id/J/JR/JROBINSON/%{cpan_name}-%{version}.tar.gz
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%{perl_requires}
 BuildRequires:  perl
 BuildRequires:  perl-macros
 BuildRequires:  perl(Carp::Clan)
@@ -37,23 +37,13 @@ BuildRequires:  perl(Class::Data::Inheritable) >= 0.02
 BuildRequires:  perl(Class::MakeMethods)
 BuildRequires:  perl(DBI)
 BuildRequires:  perl(Digest::SHA1) >= 2
-BuildRequires:  perl(File::Basename)
 BuildRequires:  perl(File::ShareDir) >= 1
-BuildRequires:  perl(File::Spec)
-BuildRequires:  perl(GD)
-BuildRequires:  perl(Graph::Directed)
-BuildRequires:  perl(GraphViz)
-BuildRequires:  perl(IO::Dir)
-BuildRequires:  perl(IO::Scalar) >= 2.110
+BuildRequires:  perl(IO::Scalar) >= 2.11
+BuildRequires:  perl(Moo) >= 0.009007
 BuildRequires:  perl(Parse::RecDescent) >= 1.962002
-BuildRequires:  perl(Spreadsheet::ParseExcel) >= 0.41
-BuildRequires:  perl(Template) >= 2.2
 BuildRequires:  perl(Test::Differences)
 BuildRequires:  perl(Test::Exception)
-BuildRequires:  perl(Text::ParseWords)
-BuildRequires:  perl(Text::RecordParser) >= 0.02
-BuildRequires:  perl(XML::LibXML) >= 1.69
-BuildRequires:  perl(XML::Writer) >= 0.500
+BuildRequires:  perl(XML::Writer) >= 0.5
 BuildRequires:  perl(YAML) >= 0.66
 Requires:       perl(Carp::Clan)
 Requires:       perl(Class::Accessor::Fast)
@@ -62,24 +52,18 @@ Requires:       perl(Class::Data::Inheritable) >= 0.02
 Requires:       perl(Class::MakeMethods)
 Requires:       perl(DBI)
 Requires:       perl(Digest::SHA1) >= 2
-Requires:       perl(File::Basename)
 Requires:       perl(File::ShareDir) >= 1
-Requires:       perl(File::Spec)
-Requires:       perl(GD)
-Requires:       perl(Graph::Directed)
-Requires:       perl(GraphViz)
-Requires:       perl(IO::Dir)
-Requires:       perl(IO::Scalar) >= 2.110
+Requires:       perl(IO::Scalar) >= 2.11
+Requires:       perl(Moo) >= 0.009007
 Requires:       perl(Parse::RecDescent) >= 1.962002
-Requires:       perl(Spreadsheet::ParseExcel) >= 0.41
-Requires:       perl(Template) >= 2.2
-Requires:       perl(Test::Differences)
-Requires:       perl(Test::Exception)
-Requires:       perl(Text::ParseWords)
-Requires:       perl(Text::RecordParser) >= 0.02
-Requires:       perl(XML::LibXML) >= 1.69
-Requires:       perl(XML::Writer) >= 0.500
-Requires:       perl(YAML) >= 0.66
+Requires:       perl(XML::Writer) >= 0.5
+Recommends:     perl(GD)
+Recommends:     perl(Graph::Directed)
+Recommends:     perl(GraphViz)
+Recommends:     perl(Spreadsheet::ParseExcel) >= 0.41
+Recommends:     perl(Template) >= 2.2
+Recommends:     perl(Text::RecordParser) >= 0.02
+Recommends:     perl(XML::LibXML) >= 1.69
 
 %description
 This documentation covers the API for SQL::Translator. For a more general
diff --git a/sqlite.patch b/sqlite.patch
index 8ae29a7..20424b3 100644
--- a/sqlite.patch
+++ b/sqlite.patch
@@ -1,5 +1,7 @@
---- SQL-Translator-0.11006/lib/SQL/Translator/Parser/SQLite.pm.orig	2010-06-03 10:06:04.000000000 +0200
-+++ SQL-Translator-0.11006/lib/SQL/Translator/Parser/SQLite.pm	2010-10-14 23:10:25.149865451 +0200
+Index: SQL-Translator-0.11010/lib/SQL/Translator/Parser/SQLite.pm
+===================================================================
+--- SQL-Translator-0.11010.orig/lib/SQL/Translator/Parser/SQLite.pm	2011-05-04 18:06:57.000000000 +0200
++++ SQL-Translator-0.11010/lib/SQL/Translator/Parser/SQLite.pm	2012-01-11 11:15:24.015300217 +0100
 @@ -190,6 +190,7 @@ eofile : /^\Z/
  statement : begin_transaction
      | commit
@@ -46,7 +48,7 @@
              if ( $def->{'supertype'} eq 'column' ) {
                  push @{ $tables{ $table_name }{'fields'} }, $def;
              }
-@@ -449,7 +456,7 @@ field_name : NAME
+@@ -460,7 +467,7 @@ field_name : NAME
  
  constraint_name : NAME
  
@@ -55,7 +57,7 @@
  
  conflict_algorigthm : /(rollback|abort|fail|ignore|replace)/i
  
-@@ -498,7 +505,7 @@ create : CREATE TEMPORARY(?) TRIGGER NAM
+@@ -509,7 +516,7 @@ create : CREATE TEMPORARY(?) TRIGGER NAM
  
  database_event : /(delete|insert|update)/i
  
@@ -64,7 +66,7 @@
  
  trigger_action : for_each(?) when(?) BEGIN_C trigger_step(s) END_C
      {
-@@ -509,7 +516,7 @@ trigger_action : for_each(?) when(?) BEG
+@@ -520,7 +527,7 @@ trigger_action : for_each(?) when(?) BEG
          }
      }
  
@@ -73,7 +75,7 @@
  
  when : WHEN expr { $item[2] }
  
-@@ -527,9 +534,11 @@ trigger_step : /(select|delete|insert|up
+@@ -538,9 +545,11 @@ trigger_step : /(select|delete|insert|up
  
  before_or_after : /(before|after)/i { $return = lc $1 }
  
@@ -87,7 +89,7 @@
  
  view_name : qualified_name
  
-@@ -569,9 +578,9 @@ TABLE : /table/i
+@@ -580,9 +589,9 @@ TABLE : /table/i
  
  INDEX : /index/i
  
@@ -97,11 +99,13 @@
 -PRIMARY_KEY : /primary key/i
 +PRIMARY_KEY : /primary\s+key/i
  
- CHECK_C : /check/i
+ FOREIGN_KEY : /foreign key/i
  
---- SQL-Translator-0.11006/t/60roundtrip.t.orig	2010-06-03 10:05:59.000000000 +0200
-+++ SQL-Translator-0.11006/t/60roundtrip.t	2010-10-15 00:06:04.053904750 +0200
-@@ -203,6 +203,9 @@ sub check_roundtrip {
+Index: SQL-Translator-0.11010/t/60roundtrip.t
+===================================================================
+--- SQL-Translator-0.11010.orig/t/60roundtrip.t	2011-05-04 18:06:57.000000000 +0200
++++ SQL-Translator-0.11010/t/60roundtrip.t	2012-01-11 11:15:24.016300169 +0100
+@@ -209,6 +209,9 @@ sub check_roundtrip {
      return;
    };