diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD
index 615be3000..53a4f5fce 100644
--- a/community/mysql-workbench/PKGBUILD
+++ b/community/mysql-workbench/PKGBUILD
@@ -14,11 +14,12 @@ buildarch=12
 
 pkgname=mysql-workbench
 pkgver=8.0.23
-pkgrel=1
+pkgrel=2
 _mysql_version=${pkgver}
 _connector_version=${pkgver}
 _gdal_version=3.2.1
 _boost_version=1.73.0
+_antlr4_version=4.9.1
 pkgdesc='A cross-platform, visual database design tool developed by MySQL'
 arch=('x86_64')
 url='https://www.mysql.com/products/workbench/'
@@ -27,7 +28,7 @@ depends=('cairo' 'antlr4-runtime' 'curl' 'desktop-file-utils' 'freetype2' 'gifli
          'gtkmm3' 'hicolor-icon-theme' 'json-c' 'libgl' 'libsecret' 'libssh'
          'libxml2' 'libzip' 'pcre' 'proj' 'python' 'rapidjson' 'unixodbc'
          'vsqlite++' 'zstd')
-makedepends=('cmake' 'boost' 'mesa' 'swig' 'java-runtime' 'imagemagick' 'antlr4')
+makedepends=('cmake' 'boost' 'mesa' 'swig' 'java-runtime' 'imagemagick' "antlr4=${_antlr4_version}")
 validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5') # MySQL Release Engineering <mysql-build@oss.oracle.com>
 source=("https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${pkgver}-src.tar.gz"{,.asc}
 	"https://cdn.mysql.com/Downloads/MySQL-${_mysql_version%.*}/mysql-${_mysql_version}.tar.gz"{,.asc}
@@ -81,7 +82,7 @@ prepare() {
 	sed -i "/target_link_libraries/s|\\$|-L${srcdir}/install-bundle/usr/lib/ \\$|" backend/wbpublic/CMakeLists.txt
 
 	# be happy with more recent antlr
-	sed -i '/set(ANTLR_JAR_FILENAME/s/4.7.1/4.8/' CMakeLists.txt
+	sed -i "/set(ANTLR_JAR_FILENAME/s/4.7.1/${_antlr4_version}/" CMakeLists.txt
 
 	# remove -Wno-deprecated-copy
 	sed -i 's|-Wno-deprecated-copy||' CMakeLists.txt
@@ -152,7 +153,7 @@ build() {
 	cmake "${srcdir}/mysql-workbench-community-${pkgver}-src" \
 		-Wno-dev \
 		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -std=c++14 -fsigned-char" \
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -std=c++17 -fsigned-char" \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DMySQL_CONFIG_PATH="${srcdir}/install-bundle/usr/bin/mysql_config" \
 		-DMySQLCppConn_LIBRARY="${srcdir}/install-bundle/usr/lib/libmysqlcppconn.so" \