diff --git a/devel/argp-standalone/Makefile b/devel/argp-standalone/Makefile
index 044d32015868..200d033635b6 100644
--- a/devel/argp-standalone/Makefile
+++ b/devel/argp-standalone/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	argp-standalone
 PORTVERSION=	1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.lysator.liu.se/~nisse/misc/ \
 		LOCAL/sem
diff --git a/devel/argp-standalone/files/patch-argp-help.c b/devel/argp-standalone/files/patch-argp-help.c
new file mode 100644
index 000000000000..4074bef9f85b
--- /dev/null
+++ b/devel/argp-standalone/files/patch-argp-help.c
@@ -0,0 +1,14 @@
+--- argp-help.c.orig	2020-04-09 17:39:48 UTC
++++ argp-help.c
+@@ -1704,7 +1704,10 @@ Try `%s --help' or `%s --usage' for more information.\
+ void __argp_help (const struct argp *argp, FILE *stream,
+ 		  unsigned flags, char *name)
+ {
+-  _help (argp, 0, stream, flags, name);
++  struct argp_state state = {
++    .root_argp = argp,
++  };
++  _help (argp, &state, stream, flags, name);
+ }
+ #ifdef weak_alias
+ weak_alias (__argp_help, argp_help)