diff --git a/basis/io/unix/files/bsd/bsd.factor b/basis/io/unix/files/bsd/bsd.factor
index 18e713af2f..3c94baa39a 100644
--- a/basis/io/unix/files/bsd/bsd.factor
+++ b/basis/io/unix/files/bsd/bsd.factor
@@ -13,5 +13,8 @@ M: bsd stat>file-info ( stat -- file-info )
     {
         [ stat-st_flags >>flags ]
         [ stat-st_gen >>gen ]
-        [ stat-st_birthtimespec timespec>unix-time >>birth-time ]
+        [
+            stat-st_birthtimespec timespec>unix-time
+            >>birth-time
+        ]
     } cleave ;
diff --git a/basis/io/unix/files/files.factor b/basis/io/unix/files/files.factor
index 67da640b71..2b85420ee9 100644
--- a/basis/io/unix/files/files.factor
+++ b/basis/io/unix/files/files.factor
@@ -142,7 +142,9 @@ os {
     [ opendir dup [ (io-error) ] unless ] dip
     dupd curry swap '[ _ closedir io-error ] [ ] cleanup ; inline
 
-: find-next-file ( DIR* -- byte-array )
+HOOK: find-next-file os ( DIR* -- byte-array )
+
+M: unix find-next-file ( DIR* -- byte-array )
     "dirent" <c-object>
     f <void*>
     [ readdir_r 0 = [ (io-error) ] unless ] 2keep
@@ -159,6 +161,8 @@ M: unix (directory-entries) ( path -- seq )
         [ drop ] produce
     ] with-unix-directory ;
 
+os openbsd = [ "io.unix.files.openbsd" require ] when
+
 <PRIVATE
 
 : stat-mode ( path -- mode )
diff --git a/basis/io/unix/files/openbsd/authors.txt b/basis/io/unix/files/openbsd/authors.txt
new file mode 100644
index 0000000000..7c1b2f2279
--- /dev/null
+++ b/basis/io/unix/files/openbsd/authors.txt
@@ -0,0 +1 @@
+Doug Coleman
diff --git a/basis/io/unix/files/openbsd/openbsd.factor b/basis/io/unix/files/openbsd/openbsd.factor
new file mode 100644
index 0000000000..0a3be3f023
--- /dev/null
+++ b/basis/io/unix/files/openbsd/openbsd.factor
@@ -0,0 +1,7 @@
+! Copyright (C) 2005, 2008 Doug Coleman.
+! See http://factorcode.org/license.txt for BSD license.
+USING: unix system ;
+IN: io.unix.files
+
+M: openbsd find-next-file ( DIR* -- byte-array )
+    readdir ;
diff --git a/basis/io/unix/files/openbsd/tags.txt b/basis/io/unix/files/openbsd/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/io/unix/files/openbsd/tags.txt
@@ -0,0 +1 @@
+unportable
diff --git a/basis/unix/unix.factor b/basis/unix/unix.factor
index d7af214a49..2fcb83dc2c 100644
--- a/basis/unix/unix.factor
+++ b/basis/unix/unix.factor
@@ -160,6 +160,7 @@ FUNCTION: int pipe ( int* filedes ) ;
 FUNCTION: void* popen ( char* command, char* type ) ;
 FUNCTION: ssize_t read ( int fd, void* buf, size_t nbytes ) ;
 
+FUNCTION: dirent* readdir ( DIR* dirp ) ;
 FUNCTION: int readdir_r ( void* dirp, dirent* entry, dirent** result ) ;
 
 FUNCTION: ssize_t readlink ( char* path, char* buf, size_t bufsize ) ;