diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69f6ec800..88e9cfd0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 add_definitions(-DANTLR4CPP_STATIC)
 set(ANTLR4_WITH_STATIC_CRT OFF)
 # 4.9.3 is the latest ANTLR4 version
-set(ANTLR4_TAG tags/4.13.1)
+set(ANTLR4_TAG tags/4.13.2)
 include(ExternalAntlr4Cpp)
 
 
diff --git a/cmake/ExternalAntlr4Cpp.cmake b/cmake/ExternalAntlr4Cpp.cmake
index 086089732..e0ad63e75 100644
--- a/cmake/ExternalAntlr4Cpp.cmake
+++ b/cmake/ExternalAntlr4Cpp.cmake
@@ -13,7 +13,7 @@ if(NOT DEFINED ANTLR4_TAG)
 endif()
 
 if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*")
-  set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist/$(Configuration))
+  set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/runtime/$(Configuration))
 elseif(${CMAKE_GENERATOR} MATCHES "Xcode.*")
   set(ANTLR4_OUTPUT_DIR ${ANTLR4_ROOT}/runtime/Cpp/dist/$(CONFIGURATION))
 else()