diff --git a/packages/dev-db/mysql-workbench/mysql-workbench-6.3.10.exheres-0 b/packages/dev-db/mysql-workbench/mysql-workbench-8.0.12.exheres-0
similarity index 77%
rename from packages/dev-db/mysql-workbench/mysql-workbench-6.3.10.exheres-0
rename to packages/dev-db/mysql-workbench/mysql-workbench-8.0.12.exheres-0
index c553136b..fc63d1d9 100644
--- a/packages/dev-db/mysql-workbench/mysql-workbench-6.3.10.exheres-0
+++ b/packages/dev-db/mysql-workbench/mysql-workbench-8.0.12.exheres-0
@@ -7,8 +7,7 @@ require cmake [ api=2 ]
 
 SUMMARY="MySQL Workbench"
 HOMEPAGE="https://www.mysql.com/products/workbench/"
-DOWNLOADS="https://dev.mysql.com/get/Downloads/MySQLGUITools/${PN}-community-${PV}-src.tar.gz
-    http://www.antlr3.org/download/antlr-3.4-complete.jar"
+DOWNLOADS="https://dev.mysql.com/get/Downloads/MySQLGUITools/${PN}-community-${PV}-src.tar.gz"
 
 LICENCES="GPL-2"
 SLOT="0"
@@ -27,16 +26,18 @@ DEPENDENCIES="
         dev-cpp/ctemplate
         dev-cpp/libsigc++:2
         dev-db/libiodbc
-        dev-db/mysql-connector-c++
+        dev-db/mysql-connector-c++[>=${PV}]
         dev-db/vsqlite++
+        dev-java/antlr:4
         dev-lang/python:2.7[sqlite]
+        dev-libs/antlr4-cpp
         dev-libs/boost
         dev-libs/glib:2
+        dev-libs/libsecret:1
         dev-libs/libxml2:2.0
         dev-libs/pcre
         dev-libs/tinyxml
         dev-python/paramiko[python_abis:2.7]
-        dev-python/pexpect[python_abis:2.7]
         dev-python/pycairo[python_abis:2.7]
         gnome-bindings/atkmm:1.6
         gnome-bindings/glibmm:2.4
@@ -44,6 +45,7 @@ DEPENDENCIES="
         gnome-bindings/pangomm:1.4
         gnome-desktop/libgnome-keyring
         gnome-platform/libglade:2
+        net-libs/libssh
         sci-libs/gdal
         virtual/mysql
         x11-dri/mesa
@@ -59,9 +61,6 @@ DEPENDENCIES="
 BUGS_TO="hasufell@posteo.de"
 
 src_prepare() {
-    edo install -D "${FETCHEDDIR}"/antlr-3.4-complete.jar \
-        "${WORKBASE}"/linux-res/bin/antlr-3.4-complete.jar
-
     # fix gdal includes
     edo sed -i \
             -e 's|#include <gdal/|#include <|' \
@@ -80,6 +79,16 @@ src_prepare() {
             -e 's/\-Werror//' \
             "${CMAKE_SOURCE}"/CMakeLists.txt
 
+    # fix mysql-connector-c++ detection
+    edo sed -i \
+            -e '/MySQLCppConn_INCLUDE_DIR NAMES/s#/usr/include#/usr/include/jdbc#' \
+            "${CMAKE_SOURCE}"/build/cmake/Modules/FindMySQLCppConn.cmake
+
+    # fix antl4 jar detection
+    edo sed -i \
+            -e '/ANTLR_JAR_FILENAME/s/antlr-4.7.1-complete.jar/antlr-complete.jar/' \
+            "${CMAKE_SOURCE}"/CMakeLists.txt
+
     cmake_src_prepare
 }
 
@@ -88,6 +97,8 @@ src_configure() {
         -DIODBC_CONFIG_PATH="/usr/$(exhost --target)/bin/iodbc-config"
         -DLIB_INSTALL_DIR="/usr/$(exhost --target)/lib"
         -DSHARE_INSTALL_PREFIX=/usr/share
+        -DANTLR_JAR_PATH="/usr/share/antlr-4"
+        -DANTLR_JAR_FILENAME="antlr-complete.jar"
     )
 
     cmake_src_configure