diff --git a/audio/vgmstream/Makefile b/audio/vgmstream/Makefile
index d9ebbe5b6b8..2e9bd181987 100644
--- a/audio/vgmstream/Makefile
+++ b/audio/vgmstream/Makefile
@@ -2,7 +2,7 @@ COMMENT =	play back various video game streamed audio formats
 
 PKGNAME =	vgmstream-$V
 
-V =		1866
+V =		2117
 
 DIST_TUPLE =	github vgmstream vgmstream r$V .
 
@@ -10,7 +10,7 @@ CATEGORIES =	audio
 
 HOMEPAGE =	https://vgmstream.org/
 
-MAINTAINER =	Anthony J. Bentley <anthony@anjbe.name>
+MAINTAINER =	Anthony J. Bentley <bentley@openbsd.org>
 
 # ISC
 PERMIT_PACKAGE =	Yes
diff --git a/audio/vgmstream/distinfo b/audio/vgmstream/distinfo
index e85e40a568b..51d0eeb8f12 100644
--- a/audio/vgmstream/distinfo
+++ b/audio/vgmstream/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vgmstream-vgmstream-r1866.tar.gz) = VrrqjrpXdtdcSHyEbii0SPmXVd0ST/fIQd+Vfzc92mI=
-SIZE (vgmstream-vgmstream-r1866.tar.gz) = 8301265
+SHA256 (vgmstream-vgmstream-r2117.tar.gz) = ua0P+rtZGeHJ7CkSQW4843kWQXqMQQGWgizmxhDc3mY=
+SIZE (vgmstream-vgmstream-r2117.tar.gz) = 8631540
diff --git a/audio/vgmstream/patches/patch-Makefile b/audio/vgmstream/patches/patch-Makefile
index cd861e54512..da5e8016618 100644
--- a/audio/vgmstream/patches/patch-Makefile
+++ b/audio/vgmstream/patches/patch-Makefile
@@ -5,7 +5,7 @@ Index: Makefile
  ###############################################################################
  ### build defs
  
--DEF_CFLAGS += -ffast-math -O3 -Wall -Werror=format-security -Wvla -Wimplicit-function-declaration -Wignored-qualifiers
+-DEF_CFLAGS += -ffast-math -O3 -Wall -Werror=format-security -Wvla -Wimplicit-function-declaration -Wignored-qualifiers -Wmissing-declarations
 -
  VGM_DEBUG_FLAGS = 0
  ifeq ($(VGM_DEBUG_FLAGS),1)
diff --git a/audio/vgmstream/patches/patch-cli_vgmstream123_c b/audio/vgmstream/patches/patch-cli_vgmstream123_c
index 6e927c20196..0b7f30ae3b1 100644
--- a/audio/vgmstream/patches/patch-cli_vgmstream123_c
+++ b/audio/vgmstream/patches/patch-cli_vgmstream123_c
@@ -1,7 +1,7 @@
 Index: cli/vgmstream123.c
 --- cli/vgmstream123.c.orig
 +++ cli/vgmstream123.c
-@@ -760,7 +760,18 @@ int main(int argc, char **argv) {
+@@ -771,7 +771,18 @@ int main(int argc, char** argv) {
      signal(SIGINT,  interrupt_handler);
      signal(SIGQUIT, interrupt_handler);
  
diff --git a/audio/vgmstream/patches/patch-cli_vgmstream_cli_c b/audio/vgmstream/patches/patch-cli_vgmstream_cli_c
index 7cb79708291..4490117d144 100644
--- a/audio/vgmstream/patches/patch-cli_vgmstream_cli_c
+++ b/audio/vgmstream/patches/patch-cli_vgmstream_cli_c
@@ -1,22 +1,22 @@
 Index: cli/vgmstream_cli.c
 --- cli/vgmstream_cli.c.orig
 +++ cli/vgmstream_cli.c
-@@ -4,6 +4,7 @@
- #define POSIXLY_CORRECT
+@@ -7,6 +7,7 @@
+ #include <stdio.h>
  
  #include <getopt.h>
 +#include <stdlib.h>
- #include "../src/vgmstream.h"
- #include "../src/api.h"
- #include "../src/util.h"
-@@ -593,6 +594,10 @@ int main(int argc, char** argv) {
-     cli_config cfg = {0};
-     int i, res, ok;
+ 
+ #ifdef WIN32
+ #include <io.h>
+@@ -586,6 +587,10 @@ static bool convert_file(cli_config_t* cfg) {
+         return true;
+     }
  
 +    if (pledge("stdio rpath wpath cpath", NULL) == -1) {
 +        fprintf(stderr, "pledge\n");
 +        return 1;
 +    }
  
-     /* read args */
-     res = parse_config(&cfg, argc, argv);
+     /* main decode */
+     write_file(vgmstream, cfg);