diff --git a/x86/bin86/bin86.conf b/x86/bin86/bin86.conf
index 44aef17ce..aa128e53f 100644
--- a/x86/bin86/bin86.conf
+++ b/x86/bin86/bin86.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../bin86/bin86.conf
-# Copyright (C) 2006 - 2009 The OpenSDE Project
+# Copyright (C) 2006 - 2015 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -13,5 +13,15 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-var_append makeopt ' ' "PREFIX=$root/$prefix"
 var_append makeinstopt ' ' "PREFIX=$root/$prefix"
+hook_add premake 5 'build_bin86'
+
+build_bin86() {
+	make -j1 -f Makefile PREFIX=$root/$prefix CC="${HOSTCC:-gcc}" IFDEFFLAGS=-DGNUMAKE IFDEFNAME=ifdefg
+	make -j1 PREFIX=$root/$prefix bcc86 unproto copt as86 ld86 CFLAGS="$CFLAGS" CC="${CC:-gcc}" \
+		NATIVE='-DA_OUT_INCL=\"../libc/include/a.out.h\"'
+	make -C cpp PREFIX=$root/$prefix CFLAGS="$CFLAGS"  CC="${CC:-gcc}"
+	make -C ar PREFIX=$root/$prefix CFLAGS="$CFLAGS" CC="${CC:-gcc}"
+	make -C ld PREFIX=$root/$prefix CFLAGS="$CFLAGS" CC="${CC:-gcc}"
+	make -j1 DIST="$root/$prefix" CC="${CC:-gcc}"
+}
diff --git a/x86/bin86/bin86.desc b/x86/bin86/bin86.desc
index 59442223d..5b99638be 100644
--- a/x86/bin86/bin86.desc
+++ b/x86/bin86/bin86.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../bin86/bin86.desc
-[COPY] Copyright (C) 2006 - 2012 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2015 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY]
@@ -30,7 +30,7 @@
 
 [L] GPL
 [S] Stable
-[V] 0.16.19
+[V] 0.16.21
 [P] X -?-3-----9 102.700
 
-[D] 2870663482 Dev86src-0.16.19.tar.gz http://www.debath.co.uk/dev86/
+[D] 3827343395 dev86-0.16.21.tar.gz !https://github.com/lkundrak/dev86/archive/v0.16.21.tar.gz
diff --git a/x86/bin86/fix_ftbfs.patch b/x86/bin86/fix_ftbfs.patch
deleted file mode 100644
index 47983d443..000000000
--- a/x86/bin86/fix_ftbfs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../bin86/fix_ftbfs.patch
-# Copyright (C) 2012 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-Fix "FTBFS: ncc: illegal label": apply patch by dai that replaces strcpy by memmove.
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=591133
-
---- linux86-0.16.17/copt/copt.c.orig	2003-10-08 04:46:35.000000000 +0900
-+++ linux86-0.16.17/copt/copt.c	2010-10-12 12:30:25.000000000 +0900
-@@ -174,7 +174,7 @@ static char *readline(FILE *fp)
-   /* Delete leading white spaces */
-   for (cp = buf; *cp && isspace(*cp); cp++) ;
-   if (cp != buf && *cp)
--	strcpy(buf, cp);
-+	memmove(buf, cp, strlen(cp) + 1);
- 
-   return(buf);
- }
-
diff --git a/x86/bin86/no_elks.patch b/x86/bin86/no_elks.patch
index 2a75b269f..5e4b78511 100644
--- a/x86/bin86/no_elks.patch
+++ b/x86/bin86/no_elks.patch
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../bin86/no_elks.patch
-# Copyright (C) 2009 The OpenSDE Project
+# Copyright (C) 2015 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -14,26 +14,8 @@
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-diff -Nur dev86-0.16.17-orig/Makefile dev86-0.16.17/Makefile
---- dev86-0.16.17-orig/Makefile	2009-08-02 18:06:25.000000000 +0300
-+++ dev86-0.16.17/Makefile	2009-08-02 18:07:10.000000000 +0300
-@@ -5,11 +5,11 @@
- VERSION=0.16.17
- 
- TARGETS=install clean other \
--    bcc86 unproto copt as86 ld86 elksemu \
-+    bcc86 unproto copt as86 ld86 \
-     install-all install-bcc install-emu install-lib \
-     install-lib2 install-ln install-man install-other \
-     all-libs alt-libs library lib-386 lib-bsd lib-dos lib-fast lib-stand \
--    config tests dis88 doselks bootblocks ld86r
-+    config tests dis88 bootblocks ld86r
- 
- ELKSSRC= /usr/src/elks
- PREFIX=  /usr
-diff -Nur dev86-0.16.17-orig/makefile.in dev86-0.16.17/makefile.in
---- dev86-0.16.17-orig/makefile.in	2009-08-02 18:06:25.000000000 +0300
-+++ dev86-0.16.17/makefile.in	2009-08-02 18:08:16.000000000 +0300
+--- dev86-0.16.17/makefile.in.noelks	2006-01-25 17:03:02.000000000 -0500
++++ dev86-0.16.17/makefile.in	2006-01-25 17:03:19.000000000 -0500
 @@ -89,10 +89,10 @@
  
  #ifdef GNUMAKE
@@ -43,7 +25,7 @@ diff -Nur dev86-0.16.17-orig/makefile.in dev86-0.16.17/makefile.in
  
  install: check_config install-bcc install-man \
 -     install-lib install-emu
-+     install-lib 
++     install-lib
  
  install-all: install install-other