diff --git a/sys-devel/bin86/bin86-0.16.21.recipe b/sys-devel/bin86/bin86-0.16.21.recipe
new file mode 100644
index 000000000..a3b60ec9f
--- /dev/null
+++ b/sys-devel/bin86/bin86-0.16.21.recipe
@@ -0,0 +1,56 @@
+SUMMARY="A simple assember and linker for 8086 - 80386 machine code."
+DESCRIPTION="
+as86 is an assembler for the 8086..80386 processors, it's syntax is closer \
+to the intel/microsoft form rather than the more normal generic form of \
+the unix system assembler.
+The linker understands only the object files produced by the as86 assembler, \
+it can link them into either an impure or a separate I&D executable.
+"
+HOMEPAGE="http://v3.sk/~lkundrak/dev86/" 
+COPYRIGHT="
+	 1994 Bruce Evans
+	 1999 Robert de Bath
+"
+LICENSE="GNU GPL v2"
+SRC_URI="http://v3.sk/~lkundrak/dev86/$portVersionedName.tar.gz"
+CHECKSUM_SHA256="021e37cde3a20632c4c9000993cb4aa9f58cb82b1d3c26b9aeb62d6566925738"
+REVISION="1"
+
+ARCHITECTURES="x86 x86_64 x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PATCHES="${portVersionedName}.patchset"
+
+PROVIDES="
+	bin86$secondaryArchSuffix = $portVersion compat >= 0
+	cmd:as86
+	cmd:ld86
+	cmd:nm86
+	cmd:objdump86
+	cmd:size86
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	make $jobArgs
+}
+
+INSTALL()
+{
+	mkdir -p $binDir $manDir
+	make BINDIR=$binDir MANDIR=$manDir install
+}
diff --git a/sys-devel/bin86/patches/bin86-0.16.21.patchset b/sys-devel/bin86/patches/bin86-0.16.21.patchset
new file mode 100644
index 000000000..e8f34eab7
--- /dev/null
+++ b/sys-devel/bin86/patches/bin86-0.16.21.patchset
@@ -0,0 +1,24 @@
+From 5dba21d7b8b1850e0a590d2a4f58b56ee983deb1 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 21 May 2014 18:01:48 +0000
+Subject: apply amd64 patch from Gentoo.
+
+
+diff --git a/ld/x86_aout.h b/ld/x86_aout.h
+index 542a70d..a38488d 100644
+--- a/ld/x86_aout.h
++++ b/ld/x86_aout.h
+@@ -19,7 +19,9 @@ typedef long Long;
+ typedef int32_t Long;
+ #define __OUT_OK 1
+ #else
+-typedef char Long[4];
++#define __OUT_OK 1
++#include <inttypes.h>
++typedef int32_t Long;
+ #endif
+ #endif
+ 
+-- 
+1.8.3.4
+