diff --git a/io/bits/types/struct_statx.h b/io/bits/types/struct_statx.h
index aa862113cd..471c151eef 100644
--- a/io/bits/types/struct_statx.h
+++ b/io/bits/types/struct_statx.h
@@ -57,7 +57,9 @@ struct statx
   __uint32_t stx_atomic_write_unit_max;
   __uint32_t stx_atomic_write_segments_max;
   __uint32_t stx_dio_read_offset_align;
-  __uint64_t __statx_pad2[9];
+  __uint32_t stx_atomic_write_unit_max_opt;
+  __uint32_t __statx_pad2;
+  __uint64_t __statx_pad3[8];
 };
 
 #endif /* __statx_defined */
diff --git a/io/tst-statx.c b/io/tst-statx.c
index 465bc616d5..5cd2890c76 100644
--- a/io/tst-statx.c
+++ b/io/tst-statx.c
@@ -37,7 +37,8 @@ _Static_assert (offsetof (struct statx, stx_nlink) == 16, "statx nlink");
 _Static_assert (offsetof (struct statx, stx_ino) == 32, "statx ino");
 _Static_assert (offsetof (struct statx, stx_atime) == 64, "statx atime");
 _Static_assert (offsetof (struct statx, stx_rdev_major) == 128, "statx rdev");
-_Static_assert (offsetof (struct statx, __statx_pad2) == 0xb8, "statx pad2");
+_Static_assert (offsetof (struct statx, __statx_pad2) == 188, "statx pad2");
+_Static_assert (offsetof (struct statx, __statx_pad3) == 192, "statx pad3");
 
 #include "statx_generic.c"