diff --git a/srcpkgs/elasticsearch/template b/srcpkgs/elasticsearch/template
index dd998985f18..46ec16d9b38 100644
--- a/srcpkgs/elasticsearch/template
+++ b/srcpkgs/elasticsearch/template
@@ -1,7 +1,7 @@
 # Template file for 'elasticsearch'
 pkgname=elasticsearch
 version=1.5.0
-revision=1
+revision=2
 only_for_archs="i686 x86_64"
 depends="sv-helper virtual?java-runtime"
 short_desc="A distributed, open source search and analytics engine"
@@ -23,8 +23,11 @@ do_install() {
 	vcopy bin/elasticsearch.in.sh usr/lib/elasticsearch/bin
 	vcopy lib/*.jar usr/lib/elasticsearch/lib
 	vcopy lib/sigar/*.jar usr/lib/elasticsearch/lib/sigar
-	vcopy lib/sigar/libsigar-x86-linux.so usr/lib/elasticsearch/lib/sigar
-	vcopy lib/sigar/libsigar-amd64-linux.so usr/lib/elasticsearch/lib/sigar
+	if [ "$XBPS_TARGET_MACHINE" = "i686" ];then
+		vcopy lib/sigar/libsigar-x86-linux.so usr/lib/elasticsearch/lib/sigar
+	else
+		vcopy lib/sigar/libsigar-amd64-linux.so usr/lib/elasticsearch/lib/sigar
+	fi
 	vcopy config/*.yml etc/elasticsearch
 	ln -s /usr/lib/elasticsearch/bin/elasticsearch "${DESTDIR}"/usr/bin/elasticsearch
 	ln -s /etc/elasticsearch "${DESTDIR}"/usr/lib/elasticsearch/config