diff --git a/libretro-config.sh b/libretro-config.sh
index 12b5d493..e8257835 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -653,6 +653,13 @@ case "$platform" in
 					FORMAT_COMPILER_TARGET="unix"
 					DIST_DIR="bsd"
 					;;
+				*Haiku*)
+					platform=haiku
+					FORMAT_EXT="so"
+					BINARY_EXT=""
+					FORMAT_COMPILER_TARGET="unix"
+					DIST_DIR="haiku"
+					;;
 				osx|*Darwin*)
 					platform=osx
 					FORMAT_EXT="dylib"
diff --git a/libretro-super.sh b/libretro-super.sh
index 538d6fec..baad12e9 100755
--- a/libretro-super.sh
+++ b/libretro-super.sh
@@ -226,6 +226,12 @@ case "$platform" in
 					FORMAT_COMPILER_TARGET="unix"
 					DIST_DIR="bsd"
 					;;
+				*Haiku*)
+					platform=haiku
+					FORMAT_EXT="so"
+					FORMAT_COMPILER_TARGET="unix"
+					DIST_DIR="haiku"
+					;;
 				osx|*Darwin*)
 					platform=osx
 					FORMAT_EXT="dylib"