diff --git a/.appveyor.yml b/.appveyor.yml
index fa2c7a92..2075ac23 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,51 +7,73 @@ environment:
       VC_VERSION: 14
       BUILD_TYPE: "Win32"
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat"
 
     - PHP_VERSION: 7.0
       VC_VERSION: 14
       BUILD_TYPE: "nts-Win32"
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat"
 
     - PHP_VERSION: 7.1
       VC_VERSION: 14
       BUILD_TYPE: "Win32"
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat"
 
     - PHP_VERSION: 7.1
       VC_VERSION: 14
       BUILD_TYPE: "nts-Win32"
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      VCVARSALL: "%VS120COMNTOOLS%/../../VC/vcvarsall.bat"
 
     - PHP_VERSION: 7.2
       VC_VERSION: 15
       BUILD_TYPE: "Win32"
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
 
     - PHP_VERSION: 7.2
       VC_VERSION: 15
       BUILD_TYPE: "nts-Win32"
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
 
     - PHP_VERSION: 7.3
       VC_VERSION: 15
       BUILD_TYPE: Win32
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
 
     - PHP_VERSION: 7.3
       VC_VERSION: 15
       BUILD_TYPE: nts-Win32
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
 
     - PHP_VERSION: 7.4
       VC_VERSION: 15
       BUILD_TYPE: Win32
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
 
     - PHP_VERSION: 7.4
       VC_VERSION: 15
       BUILD_TYPE: nts-Win32
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      VCVARSALL: "%VS140COMNTOOLS%/../../VC/vcvarsall.bat"
+
+    - PHP_VERSION: 8.0
+      VC_VERSION: 16
+      BUILD_TYPE: Win32
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat"
+
+    - PHP_VERSION: 8.0
+      VC_VERSION: 16
+      BUILD_TYPE: nts-Win32
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      VCVARSALL: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat"
 
   PHP_SDK_VERSION: 2.1.9
   PHP_AVM: https://raw.githubusercontent.com/sergeyklay/php-appveyor/master/php-appveyor.psm1
@@ -77,6 +99,7 @@ branches:
   only:
     - master
     - development
+    - windows-builds-php8
 
 init:
   - ps: $DebugPreference = 'SilentlyContinue' # Continue
@@ -93,9 +116,8 @@ install:
   - ps: TuneUpPhp
 
 build_script:
+  - if NOT "%VCVARSALL%" == "" call "%VCVARSALL%" %PLATFORM%
   - ps: InitializeBuildVars
-  - '"%VSCOMNTOOLS%\VsDevCmd" %PLATFORM%'
-  - '"%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %ARCH%'
   - phpsdk_setvars
   - cmd /c .ci\build-win32.bat
   - phpize
diff --git a/.ci/AppVeyor.psm1 b/.ci/AppVeyor.psm1
index 337311b9..d4887f7b 100644
--- a/.ci/AppVeyor.psm1
+++ b/.ci/AppVeyor.psm1
@@ -6,27 +6,6 @@
 # the LICENSE file that was distributed with this source code.
 
 Function InitializeBuildVars {
-	switch ($Env:VC_VERSION) {
-		'14' {
-			If (-not (Test-Path $Env:VS120COMNTOOLS)) {
-				Throw 'The VS120COMNTOOLS environment variable is not set. Check your MS VS installation'
-			}
-			$Env:VSCOMNTOOLS = $Env:VS120COMNTOOLS
-			break
-		}
-		'15' {
-			If (-not (Test-Path $Env:VS140COMNTOOLS)) {
-				Throw 'The VS140COMNTOOLS environment variable is not set. Check your MS VS installation'
-			}
-			$Env:VSCOMNTOOLS = $Env:VS140COMNTOOLS
-			break
-		}
-		default {
-			Throw 'This script is designed to run with MS VS 14/15. Check your MS VS installation'
-			break
-		}
-	}
-
 	If ($Env:PLATFORM -eq 'x64') {
 		$Env:ARCH = 'x86_amd64'
 	} Else {
diff --git a/README.md b/README.md
index e58e3f8e..a12c44b3 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 The Zephir Parser delivered as a C extension for the PHP language.
 
-Supported PHP versions: **7.0**, **7.1**, **7.2**, **7.3** and  **7.4**.
+Supported PHP versions: **7.0**, **7.1**, **7.2**, **7.3**,  **7.4** and **8.0**
 
 **NOTE:** The [`development`][:dev-branch:]
 branch will always contain the latest **unstable** version. If you wish to