diff --git a/CREDITS.txt b/CREDITS.txt
index 38d7dd6..868bd3e 100644
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -81,6 +81,9 @@ Mingw support,
 General bug fixes:
     Matze Braun
 
+Haiku support:
+    scott mc
+
 Bug fixes:
     Jörg Walter
 
diff --git a/physfs_platforms.h b/physfs_platforms.h
index 6079399..df4fe48 100644
--- a/physfs_platforms.h
+++ b/physfs_platforms.h
@@ -12,7 +12,11 @@
  *  PHYSFS_PLATFORM_UNIX on that system.
  */
 
-#if ((defined __BEOS__) || (defined __beos__))
+#if (defined __HAIKU__)
+#  define PHYSFS_PLATFORM_HAIKU
+#  define PHYSFS_PLATFORM_BEOS
+#  define PHYSFS_PLATFORM_POSIX
+#elif ((defined __BEOS__) || (defined __beos__))
 #  define PHYSFS_PLATFORM_BEOS
 #  define PHYSFS_PLATFORM_POSIX
 #elif (defined _WIN32_WCE) || (defined _WIN64_WCE)
diff --git a/platform/beos.cpp b/platform/beos.cpp
index aac27eb..1e35f29 100644
--- a/platform/beos.cpp
+++ b/platform/beos.cpp
@@ -11,6 +11,18 @@
 
 #ifdef PHYSFS_PLATFORM_BEOS
 
+#ifdef PHYSFS_PLATFORM_HAIKU
+#include <os/kernel/OS.h>
+#include <os/app/Roster.h>
+#include <os/storage/Volume.h>
+#include <os/storage/VolumeRoster.h>
+#include <os/storage/Directory.h>
+#include <os/storage/Entry.h>
+#include <os/storage/Path.h>
+#include <os/kernel/fs_info.h>
+#include <os/device/scsi.h>
+#include <os/support/Locker.h>
+#else
 #include <be/kernel/OS.h>
 #include <be/app/Roster.h>
 #include <be/storage/Volume.h>
@@ -21,6 +33,7 @@
 #include <be/kernel/fs_info.h>
 #include <be/device/scsi.h>
 #include <be/support/Locker.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>