diff --git a/source/lib/interface.c b/source/lib/interface.c
index 8cf11b85039..2bd7d6ddbe0 100644
--- a/source/lib/interface.c
+++ b/source/lib/interface.c
@@ -60,10 +60,12 @@ static void add_interface(struct in_addr ip, struct in_addr nmask)
 		return;
 	}
 
+#if !defined(__s390__)
 	if (ip_equal(nmask, allones_ip)) {
 		DEBUG(3,("not adding non-broadcast interface %s\n",inet_ntoa(ip)));
 		return;
 	}
+#endif
 
 	iface = SMB_MALLOC_P(struct interface);
 	if (!iface) return;
@@ -196,7 +198,10 @@ void load_interfaces(void)
 			exit(1);
 		}
 		for (i=0;i<total_probed;i++) {
-			if (probed_ifaces[i].netmask.s_addr != allones_ip.s_addr &&
+			if (
+#if !defined(__s390__)
+			    probed_ifaces[i].netmask.s_addr != allones_ip.s_addr &&
+#endif
 			    probed_ifaces[i].ip.s_addr != loopback_ip.s_addr) {
 				add_interface(probed_ifaces[i].ip, 
 					      probed_ifaces[i].netmask);