diff --git a/srcpkgs/bin86/patches/fix_x86_64.diff b/srcpkgs/bin86/patches/fix_x86_64.diff
new file mode 100644
index 00000000000..f8efc33d2ba
--- /dev/null
+++ b/srcpkgs/bin86/patches/fix_x86_64.diff
@@ -0,0 +1,12 @@
+--- ld/x86_aout.h    2005-11-07 20:07:31.506442000 +0100
++++ ld/x86_aout.h 2020-02-07 20:07:41.106982496 +0100
+@@ -12,6 +12,9 @@
+ #if defined(i386) || defined(__BCC__) || defined(MSDOS)
+ typedef long Long;
+ #define __OUT_OK 1
++#elif defined(__x86_64__)
++typedef int Long;
++#define __OUT_OK 1
+ #else
+ typedef char Long[4];
+ #endif
diff --git a/srcpkgs/bin86/template b/srcpkgs/bin86/template
new file mode 100644
index 00000000000..e6f9f2f3a0b
--- /dev/null
+++ b/srcpkgs/bin86/template
@@ -0,0 +1,20 @@
+# Template file for 'bin86'
+pkgname=bin86
+version=0.16.17
+distfiles="http://www.debath.co.uk/dev86/bin86-$version.tar.gz"
+build_style=gnu_makefile
+make_build_args="PREFIX=/usr"
+make_install_args="PREFIX=$XBPS_DESTDIR/$pkgname-$version/usr
+MANDIR=$XBPS_DESTDIR/$pkgname-$version/usr/share/man/man1"
+short_desc="A complete 8086 assembler and loader"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=429ba36cb6220083ad7cf56d644b7265d401e631c93eb42f4b7ab9bb48c6829c
+long_desc="
+ This package provides a complete 8086 assembler and loader."
+
+Add_dependency run glibc
+
+pre_install()
+{
+	install -d ${DESTDIR}/usr/bin ${DESTDIR}/usr/share/man/man1
+}