diff --git a/basis/unix/ffi/freebsd/freebsd.factor b/basis/unix/ffi/freebsd/freebsd.factor
index 91d9b3cf72..06b5fab651 100644
--- a/basis/unix/ffi/freebsd/freebsd.factor
+++ b/basis/unix/ffi/freebsd/freebsd.factor
@@ -17,10 +17,13 @@ STRUCT: addrinfo
     { next addrinfo* } ;
 
 STRUCT: dirent
-    { d_fileno u_int32_t }
-    { d_reclen u_int16_t }
-    { d_type u_int8_t }
-    { d_namlen u_int8_t }
+    { d_fileno ino_t }
+    { d_off off_t }
+    { d_reclen __uint16_t }
+    { d_type uint8_t }
+    { d_pad0 uint8_t }
+    { d_namlen u_int16_t }
+    { d_pad1 uint16_t }
     { d_name char[256] } ;
 
 CONSTANT: SOL_SOCKET 0xffff
diff --git a/basis/unix/stat/freebsd/freebsd.factor b/basis/unix/stat/freebsd/freebsd.factor
index 0ba3cbb508..9a6416c22b 100644
--- a/basis/unix/stat/freebsd/freebsd.factor
+++ b/basis/unix/stat/freebsd/freebsd.factor
@@ -9,26 +9,25 @@ IN: unix.stat
 STRUCT: stat
     { st_dev dev_t }
     { st_ino ino_t }
-    { st_mode mode_t }
     { st_nlink nlink_t }
+    { st_mode mode_t }
+    { st_pading0 __int16_t }
     { st_uid uid_t }
     { st_gid gid_t }
+    { st_pading1 __int32_t }
     { st_rdev dev_t }
     { st_atimespec timespec }
     { st_mtimespec timespec }
     { st_ctimespec timespec }
+    { st_birthtimespec timespec }
     { st_size off_t }
     { st_blocks blkcnt_t }
     { st_blksize blksize_t }
     { st_flags fflags_t }
     { st_gen __uint64_t }
-    { st_spare __int64_t }
-    { st_birthtimespec timespec }
-    { pad0 __int32_t[2] } ;
-
-FUNCTION-ALIAS: stat-func int stat64  ( c-string pathname, stat* buf ) 
-FUNCTION-ALIAS: lstat int lstat64 ( c-string pathname, stat* buf )
-FUNCTION-ALIAS: fstat int fstat64 ( int fd, stat* buf )
-
-
+    { st_spare __int64_t[10] } ;
+    
+FUNCTION-ALIAS: stat-func int stat  ( c-string pathname, stat* buf ) 
+FUNCTION: int lstat ( c-string pathname, stat* buf )
+FUNCTION: int fstat ( int fd, stat* buf )