diff --git a/dev-libs/xapian/patches/xapian-1.2.21.patch b/dev-libs/xapian/patches/xapian-1.2.21.patch
new file mode 100644
index 000000000..9e2fb1ced
--- /dev/null
+++ b/dev-libs/xapian/patches/xapian-1.2.21.patch
@@ -0,0 +1,24 @@
+From f26cd828c65cd8d6b521165171c6373db7bd2d79 Mon Sep 17 00:00:00 2001
+From: Markus Himmel <markus@himmel-villmar.de>
+Date: Sat, 26 Dec 2015 16:57:30 +0100
+Subject: [PATCH] Fix build on Haiku
+
+---
+ common/socket_utils.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/common/socket_utils.cc b/common/socket_utils.cc
+index 99a4a23..cf43533 100644
+--- a/common/socket_utils.cc
++++ b/common/socket_utils.cc
+@@ -28,6 +28,7 @@ using namespace std;
+ 
+ #ifndef __WIN32__
+ # include <sys/socket.h>
++# include <sys/time.h>
+ #else
+ # include "safeerrno.h"
+ 
+-- 
+2.2.2
+
diff --git a/dev-libs/xapian/xapian-1.2.21.recipe b/dev-libs/xapian/xapian-1.2.21.recipe
new file mode 100644
index 000000000..d0d2d6adf
--- /dev/null
+++ b/dev-libs/xapian/xapian-1.2.21.recipe
@@ -0,0 +1,87 @@
+SUMMARY="A probabilistic information retrieval library with numerous bindings"
+DESCRIPTION="Xapian is an open source search engline library written in C++. \
+It has bindings for a large number of other programming languages, including \
+Perl, Python, Java and Ruby. It is hightly adaptable and extensible, fitting \
+a wide range of information retrieval-related tasks. Xapian empowers the \
+Omega search engine package. It supports a wide range of advanced features such \
+as native Unicode support and modern search algorithms."
+HOMEPAGE="http://xapian.org/"
+COPYRIGHT="1999-2015 The Xapian Authors"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="http://oligarchy.co.uk/xapian/$portVersion/xapian-core-$portVersion.tar.xz"
+CHECKSUM_SHA256="63f48758fbd13fa8456dd4cf9bf3ec35a096e4290f14a51ac7df23f78c162d3f"
+SOURCE_DIR="xapian-core-$portVersion"
+PATCHES="xapian-$portVersion.patch"
+
+ARCHITECTURES="x86 !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	xapian$secondaryArchSuffix = $portVersion
+	lib:libxapian$secondaryArchSuffix = 22.6.8 compat >= 22
+	cmd:copydatabase$secondaryArchSuffix = $portVersion
+	cmd:delve$secondaryArchSuffix = $portVersion
+	cmd:quest$secondaryArchSuffix = $portVersion
+	cmd:simpleexpand$secondaryArchSuffix = $portVersion
+	cmd:simpleindex$secondaryArchSuffix = $portVersion
+	cmd:simplesearch$secondaryArchSuffix = $portVersion
+	cmd:xapian_check$secondaryArchSuffix = $portVersion
+	cmd:xapian_cert_update$secondaryArchSuffix = $portVersion
+	cmd:xapian_compact$secondaryArchSuffix = $portVersion
+	cmd:xapian_config$secondaryArchSuffix = $portVersion
+	cmd:xapian_inspect$secondaryArchSuffix = $portVersion
+	cmd:xapian_metadata$secondaryArchSuffix = $portVersion
+	cmd:xapian_progsrv$secondaryArchSuffix = $portVersion
+	cmd:xapian_replicate$secondaryArchSuffix = $portVersion
+	cmd:xapian_replicate_server$secondaryArchSuffix = $portVersion
+	cmd:xapian_tcpsrv$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libuuid$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	xapian${secondaryArchSuffix} = $portVersion
+	devel:libxapian$secondaryArchSuffix = 22.6.8 compat >= 22
+	"
+REQUIRES_devel="
+	xapian$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libuuid$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:sed
+	cmd:awk
+	cmd:cmp
+	cmd:diff
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLib libxapian
+	fixPkgconfig
+
+	mkdir -p $dataDir/cmake/Modules
+	mv $libDir/cmake/xapian $dataDir/cmake/Modules/xapian
+
+	packageEntries devel \
+		$developDir \
+		$dataDir
+}