diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7faf9ccc..26b06c08 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
       fail-fast: false
 
       matrix:
-        php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
+        php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
         arch: ['x86', 'x64']
         build_type: ['ts', 'nts']
 
@@ -62,6 +62,11 @@ jobs:
             vc_prefix: 'vs'
             os: windows-2019
 
+          - php: '8.1'
+            vc_num: 16
+            vc_prefix: 'vs'
+            os: windows-2019
+
     name: "PHP-${{ matrix.php }}-${{ matrix.build_type }}-win32-${{ matrix.vc_prefix }}${{ matrix.vc_num }}-${{ matrix.arch }}"
     runs-on: ${{ matrix.os}}
 
@@ -222,7 +227,7 @@ jobs:
       fail-fast: false
 
       matrix:
-        php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
+        php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
         arch: ['x64']
         build_type: ['nts']
         name:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 721e6398..8622b21b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Added
+- Enabled support of PHP8.1 for PECL [#116](https://github.com/phalcon/php-zephir-parser/issues/116)
 
 ## [1.4.1] - 2021-09-18
 ### Changed
diff --git a/README.md b/README.md
index 019296c0..96ba8211 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ sudo yum install php-devel gcc make re2c autoconf automake
 Follow these instructions to generate a binary extension for your platform:
 
 ```bash
-git clone git://github.com/phalcon/php-zephir-parser.git
+git clone git://github.com/zephir-lang/php-zephir-parser.git
 cd php-zephir-parser
 phpize
 ./configure
@@ -86,7 +86,7 @@ If you have multiple/specific PHP versions installed, you may be able to specify
 build by using the `--with-php-config` option during configuration. For example:
 
 ```bash
-git clone git://github.com/phalcon/php-zephir-parser.git
+git clone git://github.com/zephir-lang/php-zephir-parser.git
 cd php-zephir-parser
 /usr/local/bin/phpize
 ./configure --with-php-config=/usr/local/bin/php-config
@@ -144,19 +144,19 @@ Support us with a monthly donation and help us continue our activities.
 Zephir Parser is open source software licensed under the MIT License (MIT).
 See the [LICENSE][:ext-license:] file for more information.
 
-[actions link]: https://github.com/phalcon/php-zephir-parser/actions
+[actions link]: https://github.com/zephir-lang/php-zephir-parser/actions
 [actions badge]: https://github.com/zephir-lang/php-zephir-parser/actions/workflows/ci.yml/badge.svg
 
 [discord link]: http://phalcon.io/discord
 [:badge-discord:]: https://img.shields.io/discord/310910488152375297?label=Discord&logo=discord
-[:badge-codecov:]: https://codecov.io/gh/phalcon/php-zephir-parser/branch/development/graph/badge.svg
+[:badge-codecov:]: https://codecov.io/gh/zephir-lang/php-zephir-parser/branch/development/graph/badge.svg
 [:badge-license:]: https://img.shields.io/badge/license-MIT-brightgreen.svg
-[:build-codecov:]: https://codecov.io/gh/phalcon/php-zephir-parser
-[:ext-license:]: https://github.com/phalcon/php-zephir-parser/blob/master/LICENSE
-[:latest-release:]: https://github.com/phalcon/php-zephir-parser/releases/latest
-[:dev-branch:]:https://github.com/phalcon/php-zephir-parser/tree/development
-[:branches:]: https://github.com/phalcon/php-zephir-parser/branches
-[:tags:]: https://github.com/phalcon/php-zephir-parser/tags
+[:build-codecov:]: https://codecov.io/gh/zephir-lang/php-zephir-parser
+[:ext-license:]: https://github.com/zephir-lang/php-zephir-parser/blob/master/LICENSE
+[:latest-release:]: https://github.com/zephir-lang/php-zephir-parser/releases/latest
+[:dev-branch:]:https://github.com/zephir-lang/php-zephir-parser/tree/development
+[:branches:]: https://github.com/zephir-lang/php-zephir-parser/branches
+[:tags:]: https://github.com/zephir-lang/php-zephir-parser/tags
 [:re2c:]: http://re2c.org
 [:gnu-make:]: https://www.gnu.org/software/make
 [:gnu-autoconf:]: https://www.gnu.org/software/autoconf/autoconf.html
diff --git a/package.xml b/package.xml
index 27d42ad7..2f5e33e8 100644
--- a/package.xml
+++ b/package.xml
@@ -212,7 +212,7 @@
         <required>
             <php>
                 <min>7.0.0</min>
-                <max>8.0.99</max>
+                <max>8.1.99</max>
             </php>
             <pearinstaller>
                 <min>1.10</min>