diff -r 51ceb35b1711 src/lispbibl.d
--- a/src/lispbibl.d	Tue Feb 13 18:01:47 2018 +0100
+++ b/src/lispbibl.d	Tue Feb 13 21:16:46 2018 +0100
@@ -2690,9 +2690,15 @@
        MALLOC_ADDRESS_RANGE = 0x0000000081000000UL ... 0x00000000BE000000UL
        SHLIB_ADDRESS_RANGE  = 0x000003FFFC000000UL or 0x000003FFFD000000UL
        STACK_ADDRESS_RANGE  = 0x000003FFFF000000UL
-       There is room from 0x000100000000UL to 0x03FF00000000UL. */
+       On Linux/s390x build.opensuse.org machines:
+       MMAP_FIXED_ADDRESS_HIGHEST_BIT = 62
+       CODE_ADDRESS_RANGE   = 0x0000000001000000UL
+       MALLOC_ADDRESS_RANGE = 0x0000000001000000UL
+       SHLIB_ADDRESS_RANGE  = 0x0000020000000000UL
+       STACK_ADDRESS_RANGE  = 0x000003FFFF000000UL
+       There is room from 0x000100000000UL to 0x020000000000UL. */
     #define MAPPABLE_ADDRESS_RANGE_START 0x000100000000UL
-    #define MAPPABLE_ADDRESS_RANGE_END   0x03FEFFFFFFFFUL
+    #define MAPPABLE_ADDRESS_RANGE_END   0x01FFFFFFFFFFUL
   #endif
   #if defined(UNIX_LINUX) && defined(SPARC64)
     /* On Linux 3.2/sparc64:
@@ -3463,8 +3469,8 @@
   #endif
   #if defined(UNIX_LINUX) && defined(S390_64) /* Linux/s390x */
     #define SINGLEMAP_ADDRESS_BASE 0UL
-    #define SINGLEMAP_TYPE_MASK    0x03F800000000UL
-    #define SINGLEMAP_oint_type_shift 35
+    #define SINGLEMAP_TYPE_MASK    0x01FC00000000UL
+    #define SINGLEMAP_oint_type_shift 34
     #define SINGLEMAP_WORKS 1
   #endif
   #if defined(UNIX_LINUX) && defined(SPARC64) /* Linux/sparc64 */