diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index ba9ef8d..7db7a8c 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -1141,7 +1141,7 @@
 #endif
 };
 
-struct target_stat64 {
+struct __attribute__((__packed__)) target_stat64 {
 	unsigned long long st_dev;
         unsigned long long st_ino;
 	unsigned int st_mode;
@@ -1149,10 +1149,11 @@
 	unsigned int st_uid;
 	unsigned int st_gid;
 	unsigned long long st_rdev;
-	unsigned short pad0;
+	unsigned long long __pad0;
 	long long      st_size;
 	int	       st_blksize;
 	long long      st_blocks;	/* Number 512-byte blocks allocated. */
+	unsigned int   __pad1;
 	int	       target_st_atime;
         unsigned int   target_st_atime_nsec;
 	int	       target_st_mtime;