diff --git a/.github/octocov.yml b/.github/octocov.yml
index 8c11969..abb31ec 100644
--- a/.github/octocov.yml
+++ b/.github/octocov.yml
@@ -1,7 +1,7 @@
 coverage:
   paths:
     - ../lcov.info
-  acceptable: current >= 60%
+  acceptable: current >= 50%
 testExecutionTime:
   if: false
 comment:
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 5bffd06..2cc8159 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         platform: ['linux/amd64', 'linux/arm64/v8', 'linux/s390x']
-        version: ['8.1', '8.2', '8.3']
+        version: ['8.1', '8.2', '8.3', '8.4']
         type: ['cli', 'zts']
         distro: ['bookworm', 'alpine']
     steps:
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
index ef048a7..d09039a 100644
--- a/.github/workflows/coverage.yaml
+++ b/.github/workflows/coverage.yaml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: ['8.3']
+        version: ['8.4']
         type: ['cli', 'zts']
         distro: ['bookworm']
     outputs:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08118d7..9398d6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
-# 11.0.2-dev
+# 11.0.3
+- Add support for PHP 8.4
+
+# 11.0.2
 - Add official support for PHP 8.3
 - Upgrade pskel
 
diff --git a/Dockerfile b/Dockerfile
index 7d64d3b..40aa924 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 ARG PLATFORM=${BUILDPLATFORM:-linux/amd64}
 ARG IMAGE=php
-ARG TAG=8.3-cli-bookworm
+ARG TAG=8.4-cli-bookworm
 
 FROM --platform=${PLATFORM} ${IMAGE}:${TAG}
 
diff --git a/composer.json b/composer.json
index 114ad7a..f9ad370 100644
--- a/composer.json
+++ b/composer.json
@@ -14,14 +14,12 @@
         }
     },
     "require": {
-        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
+        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6.18",
         "phpstan/phpstan": "^1.10.65",
-        "vimeo/psalm": "^5.23.1",
         "phpstan/phpstan-phpunit": "^1.3.16",
-        "psalm/plugin-phpunit": "^0.19",
         "php-cs-fixer/shim": "^3.52.1",
         "rector/rector": "^1.0.3"
     },
diff --git a/ext/php_colopl_bc.h b/ext/php_colopl_bc.h
index 31cf736..efb3dcf 100644
--- a/ext/php_colopl_bc.h
+++ b/ext/php_colopl_bc.h
@@ -21,7 +21,12 @@
 #define PHP_COLOPL_BC_H
 
 #include "php.h"
+
+#if PHP_VERSION_ID < 80400
 #include "ext/standard/php_lcg.h"
+#else
+#include "ext/random/php_random.h"
+#endif
 
 #include "php_colopl_bc_php70.h"
 #include "php_colopl_bc_php74.h"
@@ -37,7 +42,7 @@ extern zend_module_entry colopl_bc_module_entry;
 #define COLOPL_BC_PHP74_SORT_MODE_DEPRECATED	1
 #define COLOPL_BC_PHP74_SORT_MODE_LOG			2
 
-#define PHP_COLOPL_BC_VERSION "11.0.2"
+#define PHP_COLOPL_BC_VERSION "11.0.3"
 
 ZEND_BEGIN_MODULE_GLOBALS(colopl_bc)
 	bool rand_is_seeded;
diff --git a/ext/tests/php70/array_rand_zts.phpt b/ext/tests/php70/array_rand_zts.phpt
index c839202..08540be 100644
--- a/ext/tests/php70/array_rand_zts.phpt
+++ b/ext/tests/php70/array_rand_zts.phpt
@@ -6,7 +6,7 @@ colopl_bc
 date.timezone=UTC
 --SKIPIF--
 <?php
-if (PHP_ZTS === 0) print 'skip NTS not supported';
+if (PHP_ZTS === 0 || PHP_ZTS === false) print 'skip NTS not supported';
 ?>
 --FILE--
 <?php
diff --git a/ext/tests/php70/shuffle_zts.phpt b/ext/tests/php70/shuffle_zts.phpt
index 2ec2470..cd91330 100644
--- a/ext/tests/php70/shuffle_zts.phpt
+++ b/ext/tests/php70/shuffle_zts.phpt
@@ -6,7 +6,7 @@ colopl_bc
 date.timezone=UTC
 --SKIPIF--
 <?php
-if (PHP_ZTS === 0) print 'skip NTS not supported'; 
+if (PHP_ZTS === 0 || PHP_ZTS === false) print 'skip NTS not supported';
 ?>
 --FILE--
 <?php
diff --git a/ext/tests/php70/str_shuffle_zts.phpt b/ext/tests/php70/str_shuffle_zts.phpt
index eab3324..e97176c 100644
--- a/ext/tests/php70/str_shuffle_zts.phpt
+++ b/ext/tests/php70/str_shuffle_zts.phpt
@@ -6,7 +6,7 @@ colopl_bc
 date.timezone=UTC
 --SKIPIF--
 <?php
-if (PHP_ZTS === 0) print 'skip NTS not supported'; 
+if (PHP_ZTS === 0 || PHP_ZTS === false) print 'skip NTS not supported';
 ?>
 --FILE--
 <?php
diff --git a/library_test.sh b/library_test.sh
index 6e604cf..bb9d682 100755
--- a/library_test.sh
+++ b/library_test.sh
@@ -18,5 +18,4 @@ cd "/project"
   composer install
   composer exec -- phpunit "tests"
   composer exec -- phpstan
-  composer exec -- psalm
 cd -
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
deleted file mode 100644
index 20fe7f7..0000000
--- a/psalm-baseline.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
-  <file src="library.php">
-    <LessSpecificReturnType>
-      <code><![CDATA[array-key|false|null]]></code>
-      <code><![CDATA[bool|null]]></code>
-      <code><![CDATA[bool|null]]></code>
-      <code><![CDATA[bool|null]]></code>
-      <code><![CDATA[bool|null]]></code>
-      <code><![CDATA[bool|null]]></code>
-      <code><![CDATA[bool|null]]></code>
-      <code><![CDATA[bool|null]]></code>
-      <code><![CDATA[bool|null]]></code>
-      <code><![CDATA[bool|null]]></code>
-    </LessSpecificReturnType>
-  </file>
-  <file src="tests/Extension/PHP70Test.php">
-    <UnusedFunctionCall>
-      <code><![CDATA[\Colopl\ColoplBc\Php70\mt_srand]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php70\mt_srand]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php70\mt_srand]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php70\srand]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php70\srand]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php70\srand]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php70\srand]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php70\srand]]></code>
-    </UnusedFunctionCall>
-  </file>
-  <file src="tests/Extension/PHP74Test.php">
-    <DeprecatedFunction>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\array_keys(['first' => 0, 'second' => ''], '')]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\array_multisort($ary1, $ary2)]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\array_search('', ['first' => 0, 'second' => ''])]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\arsort($array)]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\asort($array)]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\eq(0, '')]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\gt('a', 0)]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\gte(0, '')]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\in_array('', [0])]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\krsort($array)]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\ksort($array)]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\lt(0, 'a')]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\lte(0, '')]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\neq(0, '')]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\rsort($array)]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\sort($array)]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\spaceship('', 0)]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\uasort($array, function (int $_left, int $_right): int {
-            return 0;
-        })]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\uksort($array, function (int $_left, int $_right): int {
-            return 0;
-        })]]></code>
-      <code><![CDATA[\Colopl\ColoplBc\Php74\usort($array, function (int $_left, int $_right): int {
-            return 0;
-        })]]></code>
-    </DeprecatedFunction>
-  </file>
-  <file src="vendor/rector/rector/src/Rector/AbstractRector.php">
-    <LessSpecificImplementedReturnType>
-      <code><![CDATA[mixed[]|int|\PhpParser\Node|null]]></code>
-    </LessSpecificImplementedReturnType>
-    <MissingConstructor>
-      <code><![CDATA[$file]]></code>
-      <code><![CDATA[$file]]></code>
-      <code><![CDATA[$file]]></code>
-      <code><![CDATA[$file]]></code>
-      <code><![CDATA[$file]]></code>
-      <code><![CDATA[$file]]></code>
-      <code><![CDATA[$file]]></code>
-      <code><![CDATA[$file]]></code>
-      <code><![CDATA[$file]]></code>
-      <code><![CDATA[$file]]></code>
-      <code><![CDATA[$file]]></code>
-      <code><![CDATA[$file]]></code>
-      <code><![CDATA[$file]]></code>
-      <code><![CDATA[$file]]></code>
-      <code><![CDATA[$file]]></code>
-      <code><![CDATA[$nodeComparator]]></code>
-      <code><![CDATA[$nodeComparator]]></code>
-      <code><![CDATA[$nodeComparator]]></code>
-      <code><![CDATA[$nodeComparator]]></code>
-      <code><![CDATA[$nodeComparator]]></code>
-      <code><![CDATA[$nodeComparator]]></code>
-      <code><![CDATA[$nodeComparator]]></code>
-      <code><![CDATA[$nodeComparator]]></code>
-      <code><![CDATA[$nodeComparator]]></code>
-      <code><![CDATA[$nodeComparator]]></code>
-      <code><![CDATA[$nodeComparator]]></code>
-      <code><![CDATA[$nodeComparator]]></code>
-      <code><![CDATA[$nodeComparator]]></code>
-      <code><![CDATA[$nodeComparator]]></code>
-      <code><![CDATA[$nodeComparator]]></code>
-      <code><![CDATA[$nodeFactory]]></code>
-      <code><![CDATA[$nodeFactory]]></code>
-      <code><![CDATA[$nodeFactory]]></code>
-      <code><![CDATA[$nodeFactory]]></code>
-      <code><![CDATA[$nodeFactory]]></code>
-      <code><![CDATA[$nodeFactory]]></code>
-      <code><![CDATA[$nodeFactory]]></code>
-      <code><![CDATA[$nodeFactory]]></code>
-      <code><![CDATA[$nodeFactory]]></code>
-      <code><![CDATA[$nodeFactory]]></code>
-      <code><![CDATA[$nodeFactory]]></code>
-      <code><![CDATA[$nodeFactory]]></code>
-      <code><![CDATA[$nodeFactory]]></code>
-      <code><![CDATA[$nodeFactory]]></code>
-      <code><![CDATA[$nodeFactory]]></code>
-      <code><![CDATA[$nodeNameResolver]]></code>
-      <code><![CDATA[$nodeNameResolver]]></code>
-      <code><![CDATA[$nodeNameResolver]]></code>
-      <code><![CDATA[$nodeNameResolver]]></code>
-      <code><![CDATA[$nodeNameResolver]]></code>
-      <code><![CDATA[$nodeNameResolver]]></code>
-      <code><![CDATA[$nodeNameResolver]]></code>
-      <code><![CDATA[$nodeNameResolver]]></code>
-      <code><![CDATA[$nodeNameResolver]]></code>
-      <code><![CDATA[$nodeNameResolver]]></code>
-      <code><![CDATA[$nodeNameResolver]]></code>
-      <code><![CDATA[$nodeNameResolver]]></code>
-      <code><![CDATA[$nodeNameResolver]]></code>
-      <code><![CDATA[$nodeNameResolver]]></code>
-      <code><![CDATA[$nodeNameResolver]]></code>
-      <code><![CDATA[$nodeTypeResolver]]></code>
-      <code><![CDATA[$nodeTypeResolver]]></code>
-      <code><![CDATA[$nodeTypeResolver]]></code>
-      <code><![CDATA[$nodeTypeResolver]]></code>
-      <code><![CDATA[$nodeTypeResolver]]></code>
-      <code><![CDATA[$nodeTypeResolver]]></code>
-      <code><![CDATA[$nodeTypeResolver]]></code>
-      <code><![CDATA[$nodeTypeResolver]]></code>
-      <code><![CDATA[$nodeTypeResolver]]></code>
-      <code><![CDATA[$nodeTypeResolver]]></code>
-      <code><![CDATA[$nodeTypeResolver]]></code>
-      <code><![CDATA[$nodeTypeResolver]]></code>
-      <code><![CDATA[$nodeTypeResolver]]></code>
-      <code><![CDATA[$nodeTypeResolver]]></code>
-      <code><![CDATA[$nodeTypeResolver]]></code>
-      <code><![CDATA[$skipper]]></code>
-      <code><![CDATA[$skipper]]></code>
-      <code><![CDATA[$skipper]]></code>
-      <code><![CDATA[$skipper]]></code>
-      <code><![CDATA[$skipper]]></code>
-      <code><![CDATA[$skipper]]></code>
-      <code><![CDATA[$skipper]]></code>
-      <code><![CDATA[$skipper]]></code>
-      <code><![CDATA[$skipper]]></code>
-      <code><![CDATA[$skipper]]></code>
-      <code><![CDATA[$skipper]]></code>
-      <code><![CDATA[$skipper]]></code>
-      <code><![CDATA[$skipper]]></code>
-      <code><![CDATA[$skipper]]></code>
-      <code><![CDATA[$skipper]]></code>
-    </MissingConstructor>
-  </file>
-</files>
diff --git a/psalm.xml b/psalm.xml
deleted file mode 100644
index d977a4e..0000000
--- a/psalm.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-        errorLevel="1"
-        strictBinaryOperands="true"
-        findUnusedBaselineEntry="true"
-        findUnusedCode="true"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns="https://getpsalm.org/schema/config"
-        xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-        errorBaseline="psalm-baseline.xml"
->
-    <projectFiles>
-        <file name="library.php"/>
-        <directory name="src"/>
-        <directory name="tests"/>
-    </projectFiles>
-    <plugins>
-        <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
-    </plugins>
-</psalm>