diff --git a/Makefile b/Makefile
index 84b1f78b7e..3af735eeb7 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ DOCDIR = $(PREFIX)/doc/haproxy
 # Use TARGET=<target_name> to optimize for a specifc target OS among the
 # following list (use the default "generic" if uncertain) :
 #    generic, linux22, linux24, linux24e, linux26, solaris,
-#    freebsd, openbsd, netbsd, cygwin, custom, aix51, aix52
+#    freebsd, openbsd, netbsd, cygwin, haiku, custom, aix51, aix52
 TARGET =
 
 #### TARGET CPU
@@ -220,6 +220,12 @@ ifeq ($(TARGET),generic)
   USE_POLL   = implicit
   USE_TPROXY = implicit
 else
+ifeq ($(TARGET),haiku)
+  # For Haiku
+  TARGET_LDFLAGS = -lnetwork
+  USE_POLL = implicit
+  USE_TPROXY = implicit
+else
 ifeq ($(TARGET),linux22)
   # This is for Linux 2.2
   USE_GETSOCKNAME = implicit
@@ -347,6 +353,7 @@ endif # linux26
 endif # linux24e
 endif # linux24
 endif # linux22
+endif # haiku
 endif # generic
 
 
diff --git a/README b/README
index a99b845ffb..b8c4e78ac4 100644
--- a/README
+++ b/README
@@ -47,6 +47,7 @@ and assign it to the TARGET variable :
   - aix51       for AIX 5.1
   - aix52       for AIX 5.2
   - cygwin      for Cygwin
+  - haiku       for Haiku
   - generic     for any other OS or version.
   - custom      to manually adjust every setting