diff -urN cairo-1.8.10/boilerplate/Makefile.sources cairo-1.8.10-haiku/boilerplate/Makefile.sources
--- cairo-1.8.10/boilerplate/Makefile.sources	2010-02-19 18:38:03.033030144 +0000
+++ cairo-1.8.10-haiku/boilerplate/Makefile.sources	2010-06-19 08:30:22.477364224 +0000
@@ -19,7 +19,7 @@
 # automake is stupid enough to always use c++ linker if we enable the
 # following lines, even if beos surface is not enabled.  Disable it for now.
 cairo_boilerplate_beos_private = cairo-boilerplate-beos-private.h
-#libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos.cpp
+cairo_boilerplate_beos_sources = cairo-boilerplate-beos.cpp
 
 cairo_boilerplate_directfb_private = cairo-boilerplate-directfb-private.h
 cairo_boilerplate_directfb_sources = cairo-boilerplate-directfb.c
diff -urN cairo-1.8.10/configure.ac cairo-1.8.10-haiku/configure.ac
--- cairo-1.8.10/configure.ac	2010-02-19 18:38:03.064487424 +0000
+++ cairo-1.8.10-haiku/configure.ac	2010-06-19 08:32:47.591134720 +0000
@@ -140,7 +140,7 @@
 
 dnl ===========================================================================
 
-CAIRO_ENABLE_SURFACE_BACKEND(beos, BeOS/Zeta, no, [
+CAIRO_ENABLE_SURFACE_BACKEND(beos, BeOS/Zeta/Haiku, no, [
   case "$host" in
     *-*-beos)
       beos_LIBS=""
@@ -148,6 +148,11 @@
       AC_CHECK_LIB(be,main,beos_LIBS="$beos_LIBS -lbe")
       AC_CHECK_LIB(zeta,main,beos_LIBS="$beos_LIBS -lzeta")
       ;;
+    *-*-haiku)
+      beos_LIBS=""
+      AC_CHECK_LIB(be,main,beos_LIBS="$beos_LIBS -lbe")
+      AC_CHECK_LIB(network,main,beos_LIBS="$beos_LIBS -lnetwork")
+      ;;
     *)
       use_beos="no (requires a BeOS platform)"
       ;;
