diff --git a/HTTP-Daemon-6.01-Call-sockhostname-on-class-object.patch b/HTTP-Daemon-6.01-Call-sockhostname-on-class-object.patch
deleted file mode 100644
index ebd0e95..0000000
--- a/HTTP-Daemon-6.01-Call-sockhostname-on-class-object.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up HTTP-Daemon-6.01/lib/HTTP/Daemon.pm.orig HTTP-Daemon-6.01/lib/HTTP/Daemon.pm
---- HTTP-Daemon-6.01/lib/HTTP/Daemon.pm.orig	2018-05-15 13:26:53.449652641 +0200
-+++ HTTP-Daemon-6.01/lib/HTTP/Daemon.pm	2018-05-15 13:28:14.239205445 +0200
-@@ -61,7 +61,7 @@ sub url
- 	$url .= '[' . inet_ntop(AF_INET6, $addr) . ']';
-     }
-     else {
--	my $host = $addr->sockhostname;
-+	my $host = $self->sockhostname;
-         if (!defined $host) {
- 	    if (sockaddr_family($addr) eq AF_INET6) {
- 		$host = '[' . inet_ntop(AF_INET6, $addr) . ']';
diff --git a/HTTP-Daemon-6.01-Resolve-specific-socket-addresses-correctly.patch b/HTTP-Daemon-6.01-Resolve-specific-socket-addresses-correctly.patch
new file mode 100644
index 0000000..ef1ff87
--- /dev/null
+++ b/HTTP-Daemon-6.01-Resolve-specific-socket-addresses-correctly.patch
@@ -0,0 +1,55 @@
+From e49f553aa8be21e5df72452e50af2e9f0b82ecad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Wed, 23 May 2018 17:31:42 +0200
+Subject: [PATCH] Resolve specific socket addresses correctly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Previous code did not formatted specific (not 0.0.0.0 or ::)
+correctly:
+
+$ perl -MHTTP::Daemon -e '$d=HTTP::Daemon->new(LocalAddr=>q{127.0.0.2}) or die; print $d->url, qq{\n}'
+Can't call method "sockhostname" without a package or object reference at /usr/share/perl5/vendor_perl/HTTP/Daemon.pm line 64.
+
+This patch also fixes formatting numerical IPv6 addresses. It seems
+that IO::Socket::IP::sockhostname() formats unresolvable addresses too.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ lib/HTTP/Daemon.pm | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/lib/HTTP/Daemon.pm b/lib/HTTP/Daemon.pm
+index 1e9d48e..216c73f 100644
+--- a/lib/HTTP/Daemon.pm
++++ b/lib/HTTP/Daemon.pm
+@@ -61,12 +61,23 @@ sub url
+ 	$url .= '[' . inet_ntop(AF_INET6, $addr) . ']';
+     }
+     else {
+-	my $host = $addr->sockhostname;
++	my $host = $self->sockhostname;
++	# sockhostname() seems to return a stringified IP address if not
++	# resolvable, then quote it for a port separator and an IPv6 zone separator.
++	# But be paranoid for a case when it already contains a bracket.
++	if (defined $host and $host =~ /:/) {
++	    if ($host =~ /[\[\]]/) {
++		$host = undef;
++	    } else {
++		$host =~ s/%/%25/g;
++		$host  = '[' . $host . ']';
++	    }
++	}
+         if (!defined $host) {
+ 	    if (sockaddr_family($addr) eq AF_INET6) {
+ 		$host = '[' . inet_ntop(AF_INET6, $addr) . ']';
+ 	    } else {
+-		$host = inet_ntop(AF_INET6, $addr);
++		$host = inet_ntop(AF_INET, $addr);
+ 	    }
+ 	}
+ 	$url .= $host;
+-- 
+2.14.3
+
diff --git a/perl-HTTP-Daemon.spec b/perl-HTTP-Daemon.spec
index fa1d826..7a7ccd5 100644
--- a/perl-HTTP-Daemon.spec
+++ b/perl-HTTP-Daemon.spec
@@ -1,6 +1,6 @@
 Name:           perl-HTTP-Daemon
 Version:        6.01
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        Simple HTTP server class
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/HTTP-Daemon/
@@ -11,9 +11,8 @@ Patch0:         HTTP-Daemon-6.01-Add-IPv6-support.patch
 # Accept undefined and empty-string LocalAddr as IO::Socket::INET does,
 # CPAN RT#91699, CPAN RT#123069
 Patch1:         HTTP-Daemon-6.01-Handle-undef-and-empty-LocalAddr.patch
-# Call "sockhostname" method on class object instead of binary string
-# bug #1578026, CPAN RT#125242
-Patch2:         HTTP-Daemon-6.01-Call-sockhostname-on-class-object.patch
+# Fix formatting specific non-local addresses, bug #1578026, CPAN RT#125242
+Patch2:         HTTP-Daemon-6.01-Resolve-specific-socket-addresses-correctly.patch
 BuildArch:      noarch
 BuildRequires:  make
 BuildRequires:  perl-generators
@@ -81,6 +80,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Wed May 23 2018 Petr Pisar <ppisar@redhat.com> - 6.01-23
+- Fix formatting numerical non-local specific IPv6 addresses (bug #1578026)
+
 * Tue May 15 2018 Jitka Plesnikova <jplesnik@redhat.com> - 6.01-22
 - Call "sockhostname" method on correct class object (bug #1578026)