diff --git a/Template-Toolkit-2.24.tar.gz b/Template-Toolkit-2.24.tar.gz
deleted file mode 100644
index bb32f16..0000000
--- a/Template-Toolkit-2.24.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:38834aa8c249f7b7fb8b7238f086a08947ea7d472d78f1f5e2b9f3dbf49d01c8
-size 499410
diff --git a/Template-Toolkit-2.25.tar.gz b/Template-Toolkit-2.25.tar.gz
new file mode 100644
index 0000000..cadfdf8
--- /dev/null
+++ b/Template-Toolkit-2.25.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f423763b01604dcf27902cc6fdb22a6d1e5d3f2f72044fd9e83123220f781e11
+size 501038
diff --git a/perl-Template-Toolkit.changes b/perl-Template-Toolkit.changes
index 0344aad..083a80c 100644
--- a/perl-Template-Toolkit.changes
+++ b/perl-Template-Toolkit.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Jul 30 05:06:51 UTC 2013 - coolo@suse.com
+
+- update to 2.25 upstreaming split_pattern.patch
+  * Jon Jensen fixed the behaviour of split() which changed in Perl 5.18.0
+  * Jay Hannah added repository information for metacpan.org et. al. 
+  * Colin Keith fixed Template::Provider's handling of directories
+  * Kevin Goess made the date plugin accept the ISO8601 "T" separator
+  * David Steinbrunner fixed various typos.
+  * Andreas Koenig silenced recent Pod::Simple warnings
+  * Slaven Rezic silenced warnings in the replace vmethod.
+  * Ricardo Signes made the Image plugin emit extra tags in a predictable order
+  * Johan Vromans added the --link option to ttree.
+  * Smylers added documentation for the ENCODING option.
+  * Andy Wardley made some minor documentation changes relating to github.
+
 -------------------------------------------------------------------
 Wed Jun 26 09:52:09 UTC 2013 - coolo@suse.com
 
diff --git a/perl-Template-Toolkit.spec b/perl-Template-Toolkit.spec
index 53c6fa8..c268e5f 100644
--- a/perl-Template-Toolkit.spec
+++ b/perl-Template-Toolkit.spec
@@ -17,14 +17,13 @@
 
 
 Name:           perl-Template-Toolkit
-Version:        2.24
+Version:        2.25
 Release:        0
 Summary:        Template Processing System
-License:        Artistic-1.0
+License:        Artistic-1.0 or GPL-1.0+
 Group:          Development/Libraries/Perl
 Url:            http://cpan.org/dist/Template-Toolkit
 Source:         http://search.cpan.org/CPAN/authors/id/A/AB/ABW/Template-Toolkit-%{version}.tar.gz
-Patch0:         https://rt.cpan.org/Public/Ticket/Attachment/1204402/635952/split_pattern.patch
 #BuildRequires:  perl-AppConfig perl-DBI perl-Date-Calc perl-XML-DOM perl-XML-Parser
 BuildRequires:  perl
 #
@@ -69,11 +68,10 @@ other offline document systems.
 
 %prep
 %setup -q -n "Template-Toolkit-%{version}"
-%patch0 -p1
 
 %build
-perl Makefile.PL
-make %{?_smp_mflags}
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
+%{__make} %{?_smp_mflags}
 
 %check
 make test
@@ -83,9 +81,6 @@ make test
 %perl_process_packlist
 %perl_gen_filelist
 
-%clean
-rm -rf %{buildroot}
-
 %files -f %{name}.files
 # normally you only need to check for doc files
 %defattr(-,root,root)
diff --git a/split_pattern.patch b/split_pattern.patch
deleted file mode 100644
index d76c525..0000000
--- a/split_pattern.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/lib/Template/VMethods.pm	2012-02-07 09:06:38.000000000 +0000
-+++ b/lib/Template/VMethods.pm	2013-04-22 16:58:34.000000000 +0000
-@@ -261,12 +261,12 @@
- 
-     if (defined $limit) {
-         return [ defined $split
--                 ? split($split, $str, $limit)
-+                 ? split("(?:)".$split, $str, $limit)
-                  : split(' ', $str, $limit) ];
-     }
-     else {
-         return [ defined $split
--                 ? split($split, $str)
-+                 ? split("(?:)".$split, $str)
-                  : split(' ', $str) ];
-     }
- }
---- a/lib/Template/Plugin/String.pm	2011-12-20 07:41:35.000000000 +0000
-+++ b/lib/Template/Plugin/String.pm	2013-04-22 16:55:36.000000000 +0000
-@@ -363,7 +363,7 @@
-     my $split = CORE::shift;
-     my $limit = CORE::shift || 0;
-     $split = '\s+' unless defined $split;
--    return [ split($split, $self->{ text }, $limit) ];
-+    return [ split("(?:)".$split, $self->{ text }, $limit) ];
- }
- 
-