diff --git a/sysutils/fdtools/Makefile b/sysutils/fdtools/Makefile
index 6b5f1e5668f0..02c51917ef62 100644
--- a/sysutils/fdtools/Makefile
+++ b/sysutils/fdtools/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2020/06/25 05:42:40 schmonz Exp $
+# $NetBSD: Makefile,v 1.7 2020/07/07 10:31:31 schmonz Exp $
 
-DISTNAME=		fdtools-2015.03.28
-PKGREVISION=		2
+DISTNAME=		fdtools-2020.05.04
 CATEGORIES=		sysutils
 MASTER_SITES=		http://code.dogmap.org/fdtools/releases/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/fdtools/PLIST b/sysutils/fdtools/PLIST
index 1857d9fe8471..8322f8676507 100644
--- a/sysutils/fdtools/PLIST
+++ b/sysutils/fdtools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2017/10/03 00:43:22 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/07/07 10:31:31 schmonz Exp $
 bin/grabconsole
 bin/multitee
 bin/pipecycle
@@ -6,6 +6,7 @@ bin/recvfd
 bin/seek0
 bin/sendfd
 bin/setblock
+bin/setstate
 bin/statfile
 bin/vc-get
 bin/vc-lock
diff --git a/sysutils/fdtools/distinfo b/sysutils/fdtools/distinfo
index bd1c1a3d6a1c..6bcfe1ea8cf4 100644
--- a/sysutils/fdtools/distinfo
+++ b/sysutils/fdtools/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.4 2019/12/15 19:07:51 schmonz Exp $
+$NetBSD: distinfo,v 1.5 2020/07/07 10:31:31 schmonz Exp $
 
-SHA1 (fdtools-2015.03.28.tar.bz2) = 7bd1c9e067df8297e1f4bc430c33903899585aee
-RMD160 (fdtools-2015.03.28.tar.bz2) = d1bfed8c1718b5ec178cc763416f677f4cc26f0d
-SHA512 (fdtools-2015.03.28.tar.bz2) = e6b5665869538758edd90876c1696d753aa5859e9dc2ceffbcac98ea682e730424ea972126d20d90945d554a833278059558d85ce5290c09b3f339d0191f565c
-Size (fdtools-2015.03.28.tar.bz2) = 40057 bytes
+SHA1 (fdtools-2020.05.04.tar.bz2) = 27737e9cad238bbaec2834c76e38f71b39d476b8
+RMD160 (fdtools-2020.05.04.tar.bz2) = 763ba9e23105dab27082ada0ed2f229f0ba3a123
+SHA512 (fdtools-2020.05.04.tar.bz2) = 9f2bc74755fe4f99f36172c5333564abe4aaca8a9c6be86b776cad348e94fbb0699ee4e7e96de10fcc8a62ad833e1769dd422d0918086396f5e0693c15e665cc
+Size (fdtools-2020.05.04.tar.bz2) = 41622 bytes
 SHA1 (patch-conf-compile_defaults_host__compile.sh) = d30f146419e30cd717c299b8196918db3095f3e8
 SHA1 (patch-conf-compile_defaults_host__link.sh) = 77e80f0ed9adc0ead6f9afea9b76dbb630ff2ce0
-SHA1 (patch-package_compile) = 43ebe2422c8331bf10a009d5d2e2537859711b1b
-SHA1 (patch-src_.mkmed-data_src_prjlibs-c_standards.h) = aa91710e0b5610ce1b1c705d5837f876fb3afea5
-SHA1 (patch-src_recvfd.c) = 4fe086cae8fa9623e29954cb03ee5a63a72d25af
+SHA1 (patch-src_.mkmed-data_src_prjlibs-c_standards.h) = f5b1b2b8d7999653994a629037169bc4d3592824
 SHA1 (patch-src_sigsched.c) = ed4cf2111ab65fb80f5cbcfd6aa0c49db12a845a
diff --git a/sysutils/fdtools/patches/patch-package_compile b/sysutils/fdtools/patches/patch-package_compile
deleted file mode 100644
index 0e384c834828..000000000000
--- a/sysutils/fdtools/patches/patch-package_compile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-package_compile,v 1.1 2019/12/15 19:07:51 schmonz Exp $
-
-Adjust to skalibs>=2.9.0.0 no longer supplying tainnow.lib.
-
---- package/compile.orig	2015-03-28 22:14:58.000000000 +0000
-+++ package/compile
-@@ -1767,7 +1767,7 @@ make_61() {
-   make_ compile/host/skalibs_sysdeps &&
-   echo &&
-   prj_echo Making compile/host/tainnow &&
--  cp ./compile/host/skalibs_sysdeps/tainnow.lib "${output?}" &&
-+  echo > "${output?}" &&
-   contents_61=`cat "${output?}"`
- } &&
- 
diff --git a/sysutils/fdtools/patches/patch-src_.mkmed-data_src_prjlibs-c_standards.h b/sysutils/fdtools/patches/patch-src_.mkmed-data_src_prjlibs-c_standards.h
index be639369b721..c9a611496d53 100644
--- a/sysutils/fdtools/patches/patch-src_.mkmed-data_src_prjlibs-c_standards.h
+++ b/sysutils/fdtools/patches/patch-src_.mkmed-data_src_prjlibs-c_standards.h
@@ -1,16 +1,18 @@
-$NetBSD: patch-src_.mkmed-data_src_prjlibs-c_standards.h,v 1.1 2018/12/17 17:04:38 schmonz Exp $
+$NetBSD: patch-src_.mkmed-data_src_prjlibs-c_standards.h,v 1.2 2020/07/07 10:31:31 schmonz Exp $
 
 Handle _XOPEN_SOURCE on SunOS.
 
---- src/.mkmed-data/src/prjlibs-c/standards.h.orig	2015-03-28 22:14:51.231617623 +0000
+--- src/.mkmed-data/src/prjlibs-c/standards.h.orig	2020-05-04 08:10:42.000000000 +0000
 +++ src/.mkmed-data/src/prjlibs-c/standards.h
-@@ -7,13 +7,16 @@
+@@ -7,7 +7,6 @@
  #endif
  #endif
  #endif
 -#define _XOPEN_SOURCE_EXTENDED 1
- #ifndef _BSD_SOURCE
- #define _BSD_SOURCE 1
+ #ifndef _DEFAULT_SOURCE
+ #define _DEFAULT_SOURCE 1
+ #endif
+@@ -16,7 +15,11 @@
  #endif
  #ifdef __sun
  #undef _XOPEN_SOURCE
diff --git a/sysutils/fdtools/patches/patch-src_recvfd.c b/sysutils/fdtools/patches/patch-src_recvfd.c
deleted file mode 100644
index 6ed14fd4e7f0..000000000000
--- a/sysutils/fdtools/patches/patch-src_recvfd.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_recvfd.c,v 1.1 2017/10/03 00:43:22 schmonz Exp $
-
-Avoid "invalid operands to binary expression" with clang.
-
---- src/recvfd.c.orig	2015-03-16 06:02:40.000000000 +0000
-+++ src/recvfd.c
-@@ -65,7 +65,8 @@ int main(int argc, char** argv) {
-     if (named_fd<10) {
-       type_fd duped=fcntl(named_fd, F_DUPFD, 10);
-       if (duped<0) DIE0(dup);
--      if (fd_close(named_fd)!=0) DIE1(close, "descriptor");
-+      //if (fd_close(named_fd)!=0) DIE1(close, "descriptor");
-+      fd_close(named_fd);
-       named_fd=duped;
-     }
-     buf[int_fmt(buf, named_fd)]='\0';