diff --git a/guile-socket-test.patch b/guile-socket-test.patch
new file mode 100644
index 0000000..5c7f841
--- /dev/null
+++ b/guile-socket-test.patch
@@ -0,0 +1,53 @@
+commit b720f244942320731e1ceb67f3648143a3316b32
+Author: Ludovic Courtès <ludo@gnu.org>
+Date:   Tue Jan 19 18:49:06 2010 +0100
+
+    Make `sockets.test' more robust.
+    
+    * test-suite/tests/socket.test ("AF_INET6/SOCK_STREAM"): Gracefully
+      handle cases where this combination is not supported.
+
+diff --git a/test-suite/tests/socket.test b/test-suite/tests/socket.test
+index e73f585..0510f54 100644
+--- a/test-suite/tests/socket.test
++++ b/test-suite/tests/socket.test
+@@ -1,6 +1,6 @@
+ ;;;; socket.test --- test socket functions     -*- scheme -*-
+ ;;;;
+-;;;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
++;;;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ ;;;;
+ ;;;; This library is free software; you can redistribute it and/or
+ ;;;; modify it under the terms of the GNU Lesser General Public
+@@ -341,7 +341,9 @@
+ 
+       ;; testing `bind', `listen' and `connect' on stream-oriented sockets
+ 
+-      (let ((server-socket (socket AF_INET6 SOCK_STREAM 0))
++      (let ((server-socket
++             ;; Some platforms don't support this protocol/family combination.
++             (false-if-exception (socket AF_INET6 SOCK_STREAM 0)))
+ 	    (server-bound? #f)
+ 	    (server-listening? #f)
+ 	    (server-pid #f)
+@@ -350,6 +352,8 @@
+ 	    (client-port 9998))
+ 
+ 	(pass-if "bind"
++          (if (not server-socket)
++              (throw 'unresolved))
+ 	  (catch 'system-error
+ 	    (lambda ()
+ 	      (bind server-socket AF_INET6 ipv6-addr server-port)
+@@ -361,8 +365,10 @@
+ 		      (else (apply throw args)))))))
+ 
+ 	(pass-if "bind/sockaddr"
+-	  (let* ((sock (socket AF_INET6 SOCK_STREAM 0))
++	  (let* ((sock (false-if-exception (socket AF_INET6 SOCK_STREAM 0)))
+ 		 (sockaddr (make-socket-address AF_INET6 ipv6-addr client-port)))
++            (if (not sock)
++                (throw 'unresolved))
+ 	    (catch 'system-error
+ 	      (lambda ()
+ 		(bind sock sockaddr)
diff --git a/guile1.changes b/guile1.changes
index 95cad68..d900851 100644
--- a/guile1.changes
+++ b/guile1.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Dec 14 22:10:47 UTC 2013 - uweigand@de.ibm.com
+
+- Make `socket.test' more robust
+  * guile-socket-test.patch (from git branch_release-1-8)
+
 -------------------------------------------------------------------
 Mon Jun 17 13:37:13 UTC 2013 - pgajdos@suse.com
 
diff --git a/guile1.spec b/guile1.spec
index d62b7f8..cca2a80 100644
--- a/guile1.spec
+++ b/guile1.spec
@@ -43,6 +43,7 @@ Patch2:         guile-1.6.10-mktemp.patch
 Patch3:         guile-popen-test.patch
 Patch5:         guile-gcc.patch
 Patch6:         guile-automake-1.13.patch
+Patch7:         guile-socket-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         fileutils sh-utils
 PreReq:         %install_info_prereq
@@ -150,6 +151,7 @@ contains the files necessary to link against the guile libraries.
 %patch3
 %patch5
 %patch6 -p1
+%patch7 -p1
 # guile-1.8.1: The code is not so good for -Werror (unused results of write()).
 sed -i s/-Werror// configure.in configure