diff --git a/configure.ac b/configure.ac
index 1dcb00f5e..10879ee8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,6 +81,17 @@ case "$host" in
         ;;
 esac
 
+dnl use CXX for linker on Haiku
+case "$host" in
+    *-*-haiku*)
+        LINKER=CXX
+        ;;
+    *)
+        LINKER=CC
+        ;;
+esac
+AC_SUBST(LINKER)
+
 if test x$srcdir != x.; then
     INCLUDE="-Iinclude $INCLUDE"
 elif test -d .git; then