diff --git a/.gitignore b/.gitignore
index 58fa97b..d43a3cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ Net-SSH2-0.28.tar.gz
 /Net-SSH2-0.53.tar.gz
 /Net-SSH2-0.55.tar.gz
 /Net-SSH2-0.56.tar.gz
+/Net-SSH2-0.58.tar.gz
diff --git a/Net-SSH2-auth_agent-workaround-bug-on-libssh2_agent_disconnec.patch b/Net-SSH2-auth_agent-workaround-bug-on-libssh2_agent_disconnec.patch
deleted file mode 100644
index 09ac354..0000000
--- a/Net-SSH2-auth_agent-workaround-bug-on-libssh2_agent_disconnec.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 54ae30a67b59cc6d411b7026897e58300a4b030d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Salvador=20Fandi=C3=B1o?= <sfandino@yahoo.com>
-Date: Sat, 5 Dec 2015 21:35:27 +0100
-Subject: [PATCH 1/6] auth_agent: workaround bug on libssh2_agent_disconnect
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-libssh2_agent_disconnect was being called twice, once directly and
-other under the hood by libssh2_agent_free. Unfortunatelly, due to a
-bug (reported!) on libssh2, that resulted in trying to close an
-already closed file descriptor.
-
-This patch removes the useless explicit call.
-
-Signed-off-by: Petr Šabata <contyk@redhat.com>
----
- SSH2.xs | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/SSH2.xs b/SSH2.xs
-index 2fc0ea2..28dab4a 100644
---- a/SSH2.xs
-+++ b/SSH2.xs
-@@ -1212,7 +1212,6 @@ CODE:
-                     }
-                 }
-             }
--            libssh2_agent_disconnect(agent);
-         }
-         libssh2_agent_free(agent);
-     }
--- 
-2.5.0
-
diff --git a/perl-Net-SSH2.spec b/perl-Net-SSH2.spec
index 0f0b6cc..b27e8b3 100644
--- a/perl-Net-SSH2.spec
+++ b/perl-Net-SSH2.spec
@@ -1,13 +1,11 @@
 Name:           perl-Net-SSH2
-Version:        0.56
-Release:        2%{?dist}
+Version:        0.58
+Release:        1%{?dist}
 Summary:        Support for the SSH 2 protocol via libSSH2
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Net-SSH2/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SA/SALVA/Net-SSH2-%{version}.tar.gz
-# gh@28, rhbz#1288774
-Patch0:         Net-SSH2-auth_agent-workaround-bug-on-libssh2_agent_disconnec.patch
 # Build
 BuildRequires:  findutils
 BuildRequires:  libgcrypt-devel
@@ -35,6 +33,7 @@ BuildRequires:  zlib-devel
 # Runtime
 BuildRequires:  perl(AutoLoader)
 BuildRequires:  perl(Carp)
+BuildRequires:  perl(Errno)
 BuildRequires:  perl(File::Basename)
 BuildRequires:  perl(IO::File)
 # IO::Socket::IP is preferred
@@ -61,8 +60,6 @@ all of the key exchanges, ciphers, and compression of libssh2.
 
 %prep
 %setup -q -n Net-SSH2-%{version}
-perl -pi -e 's|^#!perl|#!%{__perl}|' example/*
-%patch0 -p1
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1
@@ -85,6 +82,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Dec 21 2015 Petr Šabata <contyk@redhat.com> - 0.58-1
+- 0.58 bump
+
 * Mon Dec 07 2015 Petr Šabata <contyk@redhat.com> - 0.56-2
 - Work around a libssh2 agent bug (#1288774)
 
diff --git a/sources b/sources
index 869aa85..012cbc9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f0bc18b49ee9fe07273c639dd135a67f  Net-SSH2-0.56.tar.gz
+f16173b65f682819256e63f406a73c64  Net-SSH2-0.58.tar.gz