diff --git a/README.md b/README.md
index 20e2150..2240489 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,7 @@ Tesses Framework
 - MacOS
 - FreeBSD (including GhostBSD)
 - NetBSD
+- Haiku (only static builds work as of right now)
 - Wii (using libogc2, may be broken)
 - Switch (using libnx, may be broken)
 - Android (kinda, uses legacy and hardcoded /sdcard api unless you use TF_AllowPortable(std::string))
diff --git a/src/Platform/Environment.cpp b/src/Platform/Environment.cpp
index a1b6bee..a3990bc 100644
--- a/src/Platform/Environment.cpp
+++ b/src/Platform/Environment.cpp
@@ -332,14 +332,18 @@ std::string GetPlatform() {
 #if TARGET_OS_WATCH
     return "Apple Watch";
 #endif
-
-#if __EMSCRIPTEN__
-    return "WebAssembly";
-#endif
-
     return "Unknown Apple Device";
 #endif
+#if defined(__EMSCRIPTEN__)
+	return "WebAssembly";
+#endif
+#if defined(__HAIKU__)
+	return "Haiku";
+#endif
+#if defined(__TessesOS__)
+	return "TessesOS";
+#endif
 
     return "Unknown";
 }
-} // namespace Tesses::Framework::Platform::Environment
\ No newline at end of file
+} // namespace Tesses::Framework::Platform::Environment