diff --git a/net/nbdkit/Makefile b/net/nbdkit/Makefile
index 5ef96f628997..24b16a3cd6cf 100644
--- a/net/nbdkit/Makefile
+++ b/net/nbdkit/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	nbdkit
-PORTVERSION=	1.20.2
+PORTVERSION=	1.20.4
 CATEGORIES=	net
 # XXX Although nbdkit uses github for its homepage, the release tarballs served
 # by github haven't been through autoconf.  So we must download the sources
diff --git a/net/nbdkit/distinfo b/net/nbdkit/distinfo
index b1dd83df488b..5b6fe6bd891d 100644
--- a/net/nbdkit/distinfo
+++ b/net/nbdkit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592531771
-SHA256 (nbdkit-1.20.2.tar.gz) = b78a8b59e74284af6a34f8bcb97c42c5d8846dc59dc94a8f4538d8690953dd31
-SIZE (nbdkit-1.20.2.tar.gz) = 1783082
+TIMESTAMP = 1592693228
+SHA256 (nbdkit-1.20.4.tar.gz) = 16c7612cf95ea3908bccfe163d71a58dc3bb4d8b018e0bf86833ed9f7858b48b
+SIZE (nbdkit-1.20.4.tar.gz) = 1790677
diff --git a/net/nbdkit/files/patch-plugins_info_Makefile.in b/net/nbdkit/files/patch-plugins_info_Makefile.in
deleted file mode 100644
index 05699bc7e12b..000000000000
--- a/net/nbdkit/files/patch-plugins_info_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- plugins/info/Makefile.in.orig	2020-05-02 09:04:51 UTC
-+++ plugins/info/Makefile.in
-@@ -499,7 +499,10 @@ nbdkit_info_plugin_la_CPPFLAGS = \
- 	-I$(top_srcdir)/common/include \
- 	$(NULL)
- 
--nbdkit_info_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
-+nbdkit_info_plugin_la_CFLAGS = \
-+	$(WARNINGS_CFLAGS) \
-+	$(GNUTLS_CFLAGS)
-+
- nbdkit_info_plugin_la_LDFLAGS = \
- 	-module -avoid-version -shared $(SHARED_LDFLAGS) \
- 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \
diff --git a/net/nbdkit/files/patch-plugins_ssh_ssh.c b/net/nbdkit/files/patch-plugins_ssh_ssh.c
deleted file mode 100644
index 14cc03803840..000000000000
--- a/net/nbdkit/files/patch-plugins_ssh_ssh.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/ssh/ssh.c.orig	2020-06-18 20:38:31 UTC
-+++ plugins/ssh/ssh.c
-@@ -30,6 +30,7 @@
-  * SUCH DAMAGE.
-  */
- 
-+#include <sys/stat.h>
- #include <config.h>
- 
- #include <stdio.h>