2 files changed, 7 insertions, 1 deletions

diff --git a/channels.c b/channels.c
index 1be213bce..2dea5dfd0 100644
--- a/channels.c
+++ b/channels.c
@@ -2680,7 +2680,11 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost,
                         sock = socket(ai->ai_family, ai->ai_socktype,
                             ai->ai_protocol);
                         if (sock < 0) {
-                                if ((errno != EINVAL) && (errno != EAFNOSUPPORT)) {
+                                if ((errno != EINVAL) && (errno != EAFNOSUPPORT)
+#ifdef EPFNOSUPPORT
+                                    && (errno != EPFNOSUPPORT)
+#endif 
+                                    ) {
                                         error("socket: %.100s", strerror(errno));
                                         freeaddrinfo(aitop);
                                         return -1;
diff --git a/debian/changelog b/debian/changelog
index 4b4949042..41b2690b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ openssh (1:4.0p1-1) UNRELEASED; urgency=low
   * Make gnome-ssh-askpass stay above other windows (thanks, Liyang HU;
     closes: #296487).
   * Remove obsolete and unnecessary ssh/forward_warning debconf note.
+  * Restore Hurd X forwarding fix from #102991, lost somewhere along the
+    way.
   * debconf template translations:
     - Update Czech (thanks, Miroslav Kure; closes: #298744).
     - Update Finnish (thanks, Matti Pöllä; closes: #303787).