diff --git a/perl-HTML-Format.changes b/perl-HTML-Format.changes
index bb57bc2..d8156da 100644
--- a/perl-HTML-Format.changes
+++ b/perl-HTML-Format.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Nov 15 08:39:31 UTC 2010 - jw@novell.com
+
+- added universal-can.patch from
+  https://rt.cpan.org/Public/Bug/Display.html?id=54636
+  to avoid warnings:
+  UNIVERSAL->import is deprecated and will be removed in a future perl at
+  /usr/lib/perl5/vendor_perl/5.12.1/HTML/Formatter.pm line 110
+
 -------------------------------------------------------------------
 Sun Jan 10 15:43:32 CET 2010 - jengelh@medozas.de
 
diff --git a/perl-HTML-Format.spec b/perl-HTML-Format.spec
index 96d7317..7d06590 100644
--- a/perl-HTML-Format.spec
+++ b/perl-HTML-Format.spec
@@ -29,6 +29,7 @@ Summary:        Perl Modules to Format HTML into Plain Text, PostScript, or RTF
 Version:        2.04
 Release:        141
 Source:         HTML-Format-%{version}.tar.gz
+Patch1:		universal-can.patch
 Url:            http://cpan.org/authors/id/S/SB/SBURKE
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -46,6 +47,9 @@ Authors:
 %prep
 %setup -n HTML-Format-%{version}
 
+## universal-can.patch
+%patch1 -p1
+
 %build
 perl Makefile.PL
 make %{?_smp_mflags}
diff --git a/universal-can.patch b/universal-can.patch
new file mode 100644
index 0000000..6dcf95e
--- /dev/null
+++ b/universal-can.patch
@@ -0,0 +1,37 @@
+---
+ lib/HTML/Formatter.pm |    7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+Index: HTML-Format-2.04/lib/HTML/Formatter.pm
+===================================================================
+--- HTML-Format-2.04.orig/lib/HTML/Formatter.pm
++++ HTML-Format-2.04/lib/HTML/Formatter.pm
+@@ -107,7 +107,6 @@ use HTML::Element 3.15 ();
+ 
+ use strict;
+ use Carp;
+-use UNIVERSAL qw(can);
+ 
+ use vars qw($VERSION @Size_magic_numbers);
+ $VERSION = sprintf("%d.%02d", q$Revision: 2.04 $ =~ /(\d+)\.(\d+)/);
+@@ -207,7 +206,7 @@ sub format
+     my($self, $html) = @_;
+ 
+     croak "Usage: \$formatter->format(\$tree)"
+-     unless defined $html and ref $html and can($html, 'tag');
++     unless defined $html and ref $html and $html->can('tag');
+ 
+     if( $self->DEBUG() > 4 ) {
+       print "Tree to format:\n";
+@@ -228,9 +227,9 @@ sub format
+ 	    if (ref $node) {
+ 		$tag = $node->tag;
+ 		$func = $tag . '_' . ($start ? "start" : "end");
+-		# Use UNIVERSAL::can so that we can recover if
++		# Use ->can so that we can recover if
+ 		# a handler is not defined for the tag.
+-		if (can($self, $func)) {
++		if ($self->can($func)) {
+ 		    DEBUG > 3 and print '  ' x $depth, "Calling $func\n";
+ 		    return $self->$func($node);
+ 		} else {