diff --git a/.github/actions/install_deps.sh b/.github/actions/install_deps.sh
index 4a78dcfe63..80b2bc17fb 100755
--- a/.github/actions/install_deps.sh
+++ b/.github/actions/install_deps.sh
@@ -11,4 +11,4 @@ case `echo $1 | cut -d '-' -f 1` in
 		;;
 esac
 
-yacc --version
+bison --version
diff --git a/Dockerfile b/Dockerfile
index 128f46a18d..e95a3efb17 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@
 FROM alpine:latest
 RUN apk add --update \
       build-base \
-      byacc \
+      bison \
       libpng-dev
 COPY . /rgbds
 WORKDIR /rgbds
diff --git a/Makefile b/Makefile
index d20a7bc0d4..cc80fdc477 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ REALLDFLAGS	:= ${LDFLAGS} ${WARNFLAGS} \
 
 YFLAGS		?=
 
-YACC		:= yacc
+BISON		:= bison
 RM		:= rm -rf
 
 # Rules to build the RGBDS binaries
@@ -114,15 +114,15 @@ rgbgfx: ${rgbgfx_obj}
 
 # Rules to process files
 
-# We want the yacc invocations to pass through our rules, not default ones
+# We want the Bison invocations to pass through our rules, not default ones
 .y.o:
 
-# yacc-generated C files have an accompanying header
+# bison-generated C files have an accompanying header
 .c.h:
 	$Qtouch $@
 
 .y.c:
-	$Q${YACC} -d ${YFLAGS} -o $@ $<
+	$Q${BISON} -d ${YFLAGS} -o $@ $<
 
 .c.o:
 	$Q${CC} ${REALCFLAGS} ${PNGCFLAGS} -c -o $@ $<
@@ -206,11 +206,11 @@ develop:
 # install instructions instead.
 
 mingw32:
-	$Qmake CC=i686-w64-mingw32-gcc YACC=bison \
+	$Qmake CC=i686-w64-mingw32-gcc BISON=bison \
 		PKG_CONFIG=i686-w64-mingw32-pkg-config -j
 
 mingw64:
-	$Qmake CC=x86_64-w64-mingw32-gcc YACC=bison \
+	$Qmake CC=x86_64-w64-mingw32-gcc BISON=bison \
 		PKG_CONFIG=x86_64-w64-mingw32-pkg-config -j
 
 wine-shim: