diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index 592c486..88c04f0 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -1540,7 +1540,7 @@
 +    if (atomic_compare_and_exchange_bool_acq (__futex, id, 0) != 0)	\
 +      __val = __lll_robust_lock_wait (__futex);				\
 +    __val;								\
-+  }))
++  })
 +#define lll_robust_mutex_lock(futex, id) __lll_robust_mutex_lock (&(futex), id)
 +
 +
@@ -1560,7 +1560,7 @@
 +    if (atomic_compare_and_exchange_bool_acq (__futex, __id, 0) != 0)	\
 +      __val = __lll_robust_lock_wait (__futex);				\
 +    __val;								\
-+  }))
++  })
 +#define lll_robust_mutex_cond_lock(futex, id) \
 +  __lll_robust_mutex_cond_lock (&(futex), id)
 +
@@ -1584,7 +1584,7 @@
 +    if (atomic_compare_and_exchange_bool_acq (__futex, id, 0) != 0)	\
 +      __val = __lll_robust_timedlock_wait (__futex, abstime);		\
 +    __val;								\
-+  }))
++  })
 +#define lll_robust_mutex_timedlock(futex, abstime, id) \
 +  __lll_robust_mutex_timedlock (&(futex), abstime, id)
 +
diff --git a/glibc.spec b/glibc.spec
index ab934cc..204d4c7 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -631,6 +631,10 @@ cat > override_headers/asm/unistd.h <<EOF
 #undef __NR_newfstatat
 #undef __NR_fstatat64
 %endif
+%ifarch s390 s390x
+/* FIXME: Handle pselect6 on s390/s390x.  */
+#undef __NR_pselect6
+%endif
 #endif
 EOF
 cat > override_headers/asm/errno.h <<EOF