diff --git a/Platform/haiku.mk b/Platform/haiku.mk
new file mode 100644
index 0000000..2a72693
--- /dev/null
+++ b/Platform/haiku.mk
@@ -0,0 +1,9 @@
+# $Id$
+
+CC = cc
+AR = ar
+CFLAGS = -g -std=c99 -DPREFIX=\"$(PREFIX)\" -I $(PWD)/Common -fPIC
+LDFLAGS =
+LIBS = -lnetwork
+EXEC =
+LIB = .so
diff --git a/Server/tw_config.h b/Server/tw_config.h
index 4975d0e..27afb4c 100644
--- a/Server/tw_config.h
+++ b/Server/tw_config.h
@@ -13,6 +13,9 @@
 #define NO_IPV6
 #else
 #include <netinet/in.h>
+#ifdef __HAIKU__
+#define NO_IPV6
+#endif
 #endif
 
 #ifdef NO_IPV6
diff --git a/Server/version.c b/Server/version.c
index a3df63b..1685b0d 100644
--- a/Server/version.c
+++ b/Server/version.c
@@ -15,6 +15,8 @@ const char* tw_platform =
     "Linux"
 #elif defined(__MINGW32__)
     "Windows"
+#elif defined(__HAIKU__)
+    "Haiku"
 #else
     "Unix"
 #endif