diff --git a/dev-libs/xapian/patches/xapian-1.2.21.patch b/dev-libs/xapian/patches/xapian-1.2.21.patch
deleted file mode 100644
index 9e2fb1ced..000000000
--- a/dev-libs/xapian/patches/xapian-1.2.21.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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.25.recipe
similarity index 69%
rename from dev-libs/xapian/xapian-1.2.21.recipe
rename to dev-libs/xapian/xapian-1.2.25.recipe
index e64f581b9..01a5b1384 100644
--- a/dev-libs/xapian/xapian-1.2.21.recipe
+++ b/dev-libs/xapian/xapian-1.2.25.recipe
@@ -1,25 +1,27 @@
 SUMMARY="A probabilistic information retrieval library with numerous bindings"
-DESCRIPTION="Xapian is an open source search engline library written in C++. \
+DESCRIPTION="Xapian is an open source search engine 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"
+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="https://xapian.org/"
+COPYRIGHT="1999-2017 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_URI="https://oligarchy.co.uk/xapian/$portVersion/xapian-core-$portVersion.tar.xz"
+CHECKSUM_SHA256="7c77ff259bc92414c620015d6798f5f3e2c52907936096ec97c23c17fc0d6403"
 SOURCE_DIR="xapian-core-$portVersion"
-PATCHES="xapian-$portVersion.patch"
 
-ARCHITECTURES="x86 !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86"
+
+libVersion="22.7.3"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	xapian$secondaryArchSuffix = $portVersion
-	lib:libxapian$secondaryArchSuffix = 22.6.8 compat >= 22
+	lib:libxapian$secondaryArchSuffix = $libVersionCompat
 	cmd:copydatabase$secondaryArchSuffix = $portVersion
 	cmd:delve$secondaryArchSuffix = $portVersion
 	cmd:quest$secondaryArchSuffix = $portVersion
@@ -45,7 +47,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	xapian${secondaryArchSuffix} = $portVersion
-	devel:libxapian$secondaryArchSuffix = 22.6.8 compat >= 22
+	devel:libxapian$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	xapian$secondaryArchSuffix
@@ -57,14 +59,17 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:sed
 	cmd:awk
 	cmd:cmp
 	cmd:diff
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:sed
 	"
 
+defineDebugInfoPackage xapian$secondaryArchSuffix \
+	"$libDir"/libxapian.so.$libVersion
+
 BUILD()
 {
 	runConfigure ./configure
@@ -75,6 +80,8 @@ INSTALL()
 {
 	make install
 
+	rm -f "$libDir"/libxapian.la
+
 	prepareInstalledDevelLib libxapian
 	fixPkgconfig
 
@@ -85,3 +92,8 @@ INSTALL()
 		$developDir \
 		$dataDir
 }
+
+TEST()
+{
+	make check
+}