diff --git a/RPC-XML-0.53-ext-daemon-and-header-cb.dif b/RPC-XML-0.53-ext-daemon-and-header-cb.dif
index e1f4987..8d67030 100644
--- a/RPC-XML-0.53-ext-daemon-and-header-cb.dif
+++ b/RPC-XML-0.53-ext-daemon-and-header-cb.dif
@@ -2,7 +2,7 @@ Index: lib/RPC/XML/Server.pm
 ===================================================================
 --- lib/RPC/XML/Server.pm.orig
 +++ lib/RPC/XML/Server.pm
-@@ -128,6 +128,11 @@ sub new
+@@ -136,6 +136,11 @@ sub new
          $self->{__host} = $args{host} || '';
          $self->{__port} = $args{port} || '';
          delete @args{qw(host port)};
@@ -14,7 +14,7 @@ Index: lib/RPC/XML/Server.pm
      }
      else
      {
-@@ -146,9 +151,10 @@ sub new
+@@ -154,9 +159,10 @@ sub new
          $self->{__host} = $URI->host;
          $self->{__port} = $URI->port;
          $self->{__daemon} = $http;
@@ -26,7 +26,7 @@ Index: lib/RPC/XML/Server.pm
      }
      $resp = HTTP::Response->new();
      return "${class}::new: Unable to create HTTP::Response object"
-@@ -522,6 +528,23 @@ If a message is to be spooled to a tempo
+@@ -533,6 +539,23 @@ If a message is to be spooled to a tempo
  specific directory in which to open those files. If this is not given, then
  the C<tmpdir> method from the B<File::Spec> package is used, instead.
  
@@ -50,7 +50,7 @@ Index: lib/RPC/XML/Server.pm
  =back
  
  Any other keys in the options hash not explicitly used by the constructor are
-@@ -1081,7 +1104,6 @@ Randy J. Ray <rjray@blackperl.com>
+@@ -1124,7 +1147,6 @@ Randy J. Ray <rjray@blackperl.com>
  
  =cut
  
@@ -58,7 +58,7 @@ Index: lib/RPC/XML/Server.pm
  
  ###############################################################################
  #
-@@ -1398,6 +1420,11 @@ sub process_request
+@@ -1445,6 +1467,11 @@ sub process_request
      $peerhost = $conn->peerhost;
      while ($req = $conn->get_request('headers only'))
      {
@@ -70,7 +70,7 @@ Index: lib/RPC/XML/Server.pm
          if ($req->method eq 'HEAD')
          {
              # The HEAD method will be answered with our return headers,
-@@ -2112,3 +2139,4 @@ sub timeout
+@@ -2152,3 +2179,4 @@ sub timeout
      }
      return $old_timeout;
  }
diff --git a/RPC-XML-0.60-fix-utf8.dif b/RPC-XML-0.60-fix-utf8.dif
index 51bbe11..5e4e5c6 100644
--- a/RPC-XML-0.60-fix-utf8.dif
+++ b/RPC-XML-0.60-fix-utf8.dif
@@ -1,8 +1,8 @@
-Index: RPC-XML-0.60/lib/RPC/XML.pm
+Index: RPC-XML-0.67/lib/RPC/XML.pm
 ===================================================================
---- RPC-XML-0.60.orig/lib/RPC/XML.pm
-+++ RPC-XML-0.60/lib/RPC/XML.pm
-@@ -969,7 +969,9 @@ sub as_string
+--- RPC-XML-0.67.orig/lib/RPC/XML.pm
++++ RPC-XML-0.67/lib/RPC/XML.pm
+@@ -1023,7 +1023,9 @@ sub as_string
  {
      my $self = shift;
  
@@ -12,8 +12,8 @@ Index: RPC-XML-0.60/lib/RPC/XML.pm
 +    $text;
  }
  
- # Because of the slight diff above, length() has to be different from struct
-@@ -1249,6 +1251,7 @@ sub as_string
+ # Again, only differs from struct in that it has some extra wrapped around it.
+@@ -1314,6 +1316,7 @@ sub as_string
              '</value></param></params>';
      }
      $text .= '</methodResponse>';
diff --git a/RPC-XML-0.60-rev127.dif b/RPC-XML-0.60-rev127.dif
index af4a4f6..576c35c 100644
--- a/RPC-XML-0.60-rev127.dif
+++ b/RPC-XML-0.60-rev127.dif
@@ -1,12 +1,15 @@
---- t/40_server.t
+Index: t/40_server.t
+===================================================================
+--- t/40_server.t.orig
 +++ t/40_server.t
-@@ -55,7 +55,8 @@
- $srv = RPC::XML::Server->new(no_default => 1,
-                              host => 'localhost', port => $port);
- isa_ok($srv, 'RPC::XML::Server', '$srv<2>');
--is($srv->url, "http://localhost:$port/",
+@@ -59,8 +59,9 @@ isa_ok($srv, 'RPC::XML::Server', '$srv<2
+ # 22/09/2008 - Just allow for anything the user has attached to this address.
+ #              Aliases keep causing this test to falsely fail.
+ my @localhostinfo = gethostbyname('localhost');
 +my $loc_reverse = gethostbyaddr(inet_aton("127.0.0.1"),AF_INET);
-+is($srv->url, "http://$loc_reverse:$port/",
-    'RPC::XML::Server::url method (set)'); # This should be non-null this time
- # Test some of the simpler cases of add_method and get_method
- $res = $srv->add_method({ name      => 'perl.test.suite.test1',
+ my $localIP = join('.', unpack('C4', $localhostinfo[4]));
+-my @allhosts = ($localIP, $localhostinfo[0], split(' ', $localhostinfo[1]));
++my @allhosts = ($localIP, $localhostinfo[0], split(' ', $localhostinfo[1]), $loc_reverse);
+ for (@allhosts) { s/\./\\./g }
+ # Per RT 27778: For some reason gethostbyname('localhost') does not return
+ # "localhost" on win32
diff --git a/RPC-XML-0.60.tar.bz2 b/RPC-XML-0.60.tar.bz2
deleted file mode 100644
index eefab96..0000000
--- a/RPC-XML-0.60.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a4d4899e44bb29ec846caa44337ed8d87cf578e6e27a3fa4d9cb3efb32007b83
-size 103690
diff --git a/RPC-XML-0.67.tar.bz2 b/RPC-XML-0.67.tar.bz2
new file mode 100644
index 0000000..6d9fc79
--- /dev/null
+++ b/RPC-XML-0.67.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09c0873bea5005626f0235c659b07dbb94b6185bea5acd2fa820ff1b548524b1
+size 115080
diff --git a/perl-RPC-XML.changes b/perl-RPC-XML.changes
index 4f468ec..cb2607a 100644
--- a/perl-RPC-XML.changes
+++ b/perl-RPC-XML.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 27 10:39:06 CEST 2009 - mc@novell.com
+
+- version 0.67
+  * a lot of bugfixes and changed tests
+
 -------------------------------------------------------------------
 Mon Aug 18 13:53:46 CEST 2008 - ro@suse.de
 
diff --git a/perl-RPC-XML.spec b/perl-RPC-XML.spec
index 4800f24..295ec2f 100644
--- a/perl-RPC-XML.spec
+++ b/perl-RPC-XML.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package perl-RPC-XML (Version 0.60)
+# spec file for package perl-RPC-XML (Version 0.67)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,13 +22,13 @@ Name:           perl-RPC-XML
 BuildRequires:  perl-XML-Parser perl-libwww-perl
 #BuildRequires:  perl-XML-LibXML
 Url:            http://search.cpan.org/search?module=RPC::XML
-License:        Artistic License
+License:        Artistic License ..
 Group:          Development/Libraries/Perl
 Requires:       perl = %{perl_version} perl-XML-Parser perl-libwww-perl
 AutoReqProv:    on
 Summary:        A set of classes for core data, message and XML handling
-Version:        0.60
-Release:        28
+Version:        0.67
+Release:        1
 Source:         RPC-XML-%{version}.tar.bz2
 Patch0:         RPC-XML-0.53-ext-daemon-and-header-cb.dif
 Patch1:         RPC-XML-0.60-fix-utf8.dif
@@ -96,40 +96,3 @@ make DESTDIR=$RPM_BUILD_ROOT \
 /var/adm/perl-modules/%{name}
 
 %changelog
-* Mon Aug 18 2008 ro@suse.de
-- hack to build also in buildservice where 127.0.0.1 can
-  resolve to the hostname instead of localhost
-* Mon Apr 14 2008 mc@suse.de
-- version 0.60
-  * fix problem caused by having colons in temp-file names.
-  * fix for SSL
-  * Fixed the bug in RPC::XML::Server::process_request() could lead to an
-  infinite loop if the client shuts down the socket before the full
-  request is sent.
-  * RPC::XML::smart_encode actually die with an error when a
-  reference-type is passed in that cannot be converted.
-  * performance improvement
-  * fix the XML serialization of double values
-* Fri Jul 14 2006 mc@suse.de
-- version 0.59
-- Fixes to POD documentation
-- lib/Apache/RPC/Server.pm:
-  Fixed the logic around the setting of $no_def in new(); it was
-  handling the no_default method-argument backwards
-- fixed some testcases
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Thu Sep 29 2005 dmueller@suse.de
-- add norootforbuild
-* Sun Jul 31 2005 cthiel@suse.de
-- update to version 0.58
-* Fri Apr 01 2005 mc@suse.de
-- update to version 0.57
-- remove RPC-XML-0.53-http-compress-fix.dif ;
-  not needed anymore
-* Mon Aug 09 2004 mc@suse.de
-- update to version 0.54
-* Wed Dec 03 2003 mc@suse.de
-- fix http compression (RPC-XML-0.53-http-compress-fix.dif)
-* Tue Dec 02 2003 mc@suse.de
-- initial version 0.53