diff --git a/packages/rgbds/Makefile.patch b/packages/rgbds/Makefile.patch
index ef19fd1858..e693925c24 100644
--- a/packages/rgbds/Makefile.patch
+++ b/packages/rgbds/Makefile.patch
@@ -1,5 +1,6 @@
---- ../Makefile.orig	2019-11-01 17:25:45.000000000 +0100
-+++ ./Makefile	2020-02-23 21:55:43.646881105 +0100
+diff -uNr rgbds/Makefile rgbds.mod/Makefile
+--- rgbds/Makefile	2020-04-04 12:01:55.000000000 +0300
++++ rgbds.mod/Makefile	2020-04-14 23:07:08.846835851 +0300
 @@ -11,11 +11,9 @@
  
  # User-defined variables
@@ -18,12 +19,12 @@
  WARNFLAGS	:= -Wall
  
 -# Overridable CFLAGS
--CFLAGS		:= -g
+-CFLAGS		:= -O3
  # Non-overridable CFLAGS
- REALCFLAGS	:= ${CFLAGS} ${WARNFLAGS} -std=c99 -D_POSIX_C_SOURCE=200809L \
- 		   -Iinclude -DBUILD_VERSION_STRING=\"${VERSION_STRING}\"
+ REALCFLAGS	:= ${CFLAGS} ${WARNFLAGS} -std=c11 -D_POSIX_C_SOURCE=200809L \
+ 		   -D_DEFAULT_SOURCE -Iinclude
 -# Overridable LDFLAGS
 -LDFLAGS		:=
  # Non-overridable LDFLAGS
- REALLDFLAGS	:= ${LDFLAGS} ${WARNFLAGS}
- 
+ REALLDFLAGS	:= ${LDFLAGS} ${WARNFLAGS} \
+ 		   -DBUILD_VERSION_STRING=\"${VERSION_STRING}\"
diff --git a/packages/rgbds/src-extern-getopt.c.patch b/packages/rgbds/src-extern-getopt.c.patch
new file mode 100644
index 0000000000..7dcf207a6b
--- /dev/null
+++ b/packages/rgbds/src-extern-getopt.c.patch
@@ -0,0 +1,12 @@
+diff -uNr rgbds/src/extern/getopt.c rgbds.mod/src/extern/getopt.c
+--- rgbds/src/extern/getopt.c	2020-04-03 14:52:29.000000000 +0300
++++ rgbds.mod/src/extern/getopt.c	2020-04-14 23:04:52.158998525 +0300
+@@ -108,7 +108,7 @@
+ 			}
+ 			cnt++;
+ 		}
+-		if (cnt==1 && longonly && arg-start == mblen(start, MB_LEN_MAX)) {
++		if (cnt==1 && longonly && arg-start == mbtowc(0, start, MB_LEN_MAX)) {
+ 			int l = arg-start;
+ 			for (i=0; optstring[i]; i++) {
+ 				int j;