diff --git a/srcpkgs/stockfish/patches/makefile.patch b/srcpkgs/stockfish/patches/makefile.patch
new file mode 100644
index 00000000000..b1309f141ae
--- /dev/null
+++ b/srcpkgs/stockfish/patches/makefile.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.orig	2017-01-11 15:18:46.695935373 +0100
++++ src/Makefile	2017-01-11 15:18:52.633935353 +0100
+@@ -156,8 +156,6 @@
+ 		ifeq ($(OS),Android)
+ 			CXXFLAGS += -m$(bits)
+ 		endif
+-	else
+-		CXXFLAGS += -m$(bits)
+ 	endif
+ 
+ 	ifneq ($(KERNEL),Darwin)
diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template
new file mode 100644
index 00000000000..b44e4b8a272
--- /dev/null
+++ b/srcpkgs/stockfish/template
@@ -0,0 +1,39 @@
+# Template file for 'stockfish'
+pkgname=stockfish
+version=8
+revision=1
+build_style=gnu-makefile
+build_wrksrc="src"
+wrksrc="${pkgname}-${version}-src"
+make_build_target="build"
+hostmakedepends="unzip"
+short_desc="A free UCI chess engine derived from Glaurung"
+maintainer="cipr3s <cipr3s@gmx.com>"
+license="GPL-3"
+homepage="http://stockfishchess.org/"
+distfiles="http://stockfish.s3.amazonaws.com/${pkgname}-${version}-src.zip"
+checksum="7bad36f21f649ab24f6d7786bbb1b74b3e4037f165f32e3d42d1ae19c8874ce9"
+
+LDFLAGS+="-lpthread"
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*)
+		make_build_args+="ARCH=x86-64"
+		;;
+	i686*)
+		make_build_args+="ARCH=x86-32"
+		;;
+	aarch64*)
+		make_build_args+="ARCH=general-64"
+		;;
+	armv6*)
+		make_build_args+="ARCH=general-32"
+		;;
+	armv7*)
+		make_build_args+="ARCH=armv7"
+		;;
+esac
+
+do_install() {
+	vbin stockfish
+}