diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6957c85c28..c8c6f040ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,6 +241,10 @@ target_link_libraries(openttd
     Threads::Threads
 )
 
+if(HAIKU)
+    target_link_libraries(openttd "be" "network" "midi")
+endif()
+
 if(IPO_FOUND)
     set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE True)
     set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL True)
diff --git a/cmake/CompileFlags.cmake b/cmake/CompileFlags.cmake
index 2f7528fe3c..659a9ca724 100644
--- a/cmake/CompileFlags.cmake
+++ b/cmake/CompileFlags.cmake
@@ -158,7 +158,7 @@ macro(compile_flags)
         message(FATAL_ERROR "No warning flags are set for this compiler yet; please consider creating a Pull Request to add support for this compiler.")
     endif()
 
-    if(NOT WIN32)
+    if(NOT WIN32 AND NOT HAIKU)
         # rdynamic is used to get useful stack traces from crash reports.
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")
     endif()
diff --git a/src/music/CMakeLists.txt b/src/music/CMakeLists.txt
index b20f8aaf7c..8f87a9c936 100644
--- a/src/music/CMakeLists.txt
+++ b/src/music/CMakeLists.txt
@@ -34,7 +34,7 @@ if(NOT OPTION_DEDICATED)
     add_files(
         bemidi.cpp
         bemidi.h
-        CONDITION OPTION_HAIKU
+        CONDITION HAIKU
     )
 
     add_files(