diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8047fd255..fd0fff179 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,7 +152,7 @@ INSTALL(DIRECTORY
 	${SOURCE_DIRECTORY}/sounds
 	DESTINATION ${INSTALL_PREFIX})
 INSTALL(FILES ${SOURCE_DIRECTORY}/cdogs_icon.bmp ${SOURCE_DIRECTORY}/README.md DESTINATION ${INSTALL_PREFIX})
-IF(UNIX AND NOT APPLE)
+IF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
 	INSTALL(
 		FILES ${SOURCE_DIRECTORY}/build/linux/cdogs-sdl
 		DESTINATION ${LINKDIR}
@@ -204,6 +204,12 @@ elseif(APPLE)
 	set(CPACK_SYSTEM_NAME "OSX")
 	set(CPACK_PACKAGE_ICON
 		"${CMAKE_CURRENT_BINARY_DIR}/build/macosx/cdogs-icon.icns")
+elseif(BEOS OR HAIKU)
+	set(CPACK_GENERATOR TGZ)
+	install(
+		FILES ${SOURCE_DIRECTORY}/build/haiku/cdogs-sdl.sh
+		DESTINATION ${INSTALL_PREFIX}
+		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 ELSE()
 	SET(CPACK_GENERATOR TGZ)
 ENDIF()
diff --git a/build/haiku/cdogs-sdl.sh b/build/haiku/cdogs-sdl.sh
new file mode 100644
index 000000000..d14ea0318
--- /dev/null
+++ b/build/haiku/cdogs-sdl.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+DIR="$( cd "$( dirname "$0" )" && pwd )"
+cd "$DIR"/bin && ./cdogs-sdl
\ No newline at end of file
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 5efa8dcc9..ea0cf5614 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -1,8 +1,10 @@
 if(MSVC)
 	add_definitions(-wd"4127" -wd"4102")
 else()
-	add_definitions(-Wno-unused-label)
-	set(EXTRA_LIBRARIES "m")
+	if(NOT BEOS AND NOT HAIKU)
+		add_definitions(-Wno-unused-label)
+		set(EXTRA_LIBRARIES "m")
+	endif()
 endif()
 
 add_subdirectory(cbehave)