diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
new file mode 100644
index 0000000..9e07b88
--- /dev/null
+++ b/.github/workflows/continuous-integration.yml
@@ -0,0 +1,60 @@
+name: "Continuous Integration"
+
+on:
+  - push
+  - pull_request
+
+env:
+  COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist"
+
+jobs:
+  tests:
+    name: "CI"
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php-version:
+          - "5.3"
+          - "5.4"
+          - "5.5"
+          - "5.6"
+          - "7.0"
+          - "7.1"
+          - "7.2"
+          - "7.3"
+          - "7.4"
+          - "8.0"
+          # disabled for now as it leads to PHPUnit installing in a very old 4.3 version due to phpspec/prophecy not allowing 8.1
+          # - "8.1"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php-version }}"
+
+      - name: Get composer cache directory
+        id: composercache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composercache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: "Install latest dependencies"
+        run: |
+          # Remove PHPStan as it requires a newer PHP
+          composer remove phpstan/phpstan --dev --no-update
+          composer update ${{ env.COMPOSER_FLAGS }}
+
+      - name: "Run tests"
+        run: "composer test"
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index c0ac75f..b26a557 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -1,11 +1,11 @@
 name: "PHPStan"
 
 on:
-  push:
-  pull_request:
+  - push
+  - pull_request
 
 env:
-  COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --no-suggest --prefer-dist"
+  COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist"
 
 jobs:
   tests:
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
+          - "8.0"
 
     steps:
       - name: "Checkout"
@@ -26,25 +26,21 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
-          ini-values: "memory_limit=-1"
           php-version: "${{ matrix.php-version }}"
 
+      - name: Get composer cache directory
+        id: composercache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
-      - name: "Determine composer cache directory"
-        id: "determine-composer-cache-directory"
-        run: "echo \"::set-output name=directory::$(php bin/composer config cache-dir)\""
-
-      - name: "Cache dependencies installed with composer"
-        uses: "actions/cache@v1"
+      - name: Cache dependencies
+        uses: actions/cache@v2
         with:
-          path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
-          key: "php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}"
-          restore-keys: "php-${{ matrix.php-version }}"
+          path: ${{ steps.composercache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
 
-      - name: "Install highest dependencies from composer.json using composer binary provided by system"
+      - name: "Install latest dependencies"
         run: "composer update ${{ env.COMPOSER_FLAGS }}"
 
       - name: Run PHPStan
-        run: |
-          composer require --dev phpstan/phpstan:^0.12.26
-          vendor/bin/phpstan analyse --configuration=phpstan-config.neon
+        run: composer phpstan
diff --git a/.gitignore b/.gitignore
index 2c10524..ac4bc3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 vendor
 composer.lock
-composer.phar
\ No newline at end of file
+composer.phar
+.phpunit.result.cache
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 27c2ea3..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-language: php
-
-matrix:
-  include:
-    - php: 5.3
-      dist: precise
-    - php: 5.4
-      dist: trusty
-    - php: 5.5
-      dist: trusty
-    - php: 5.6
-      dist: xenial
-    - php: 7.0
-      dist: xenial
-    - php: 7.1
-      dist: bionic
-    - php: 7.2
-      dist: bionic
-    - php: 7.3
-      dist: bionic
-    - php: 7.4
-      dist: bionic
-    - php: nightly
-      dist: bionic
-    # Adding jobs for ppc64le
-    - php: 5.6
-      arch: ppc64le
-      dist: xenial
-    - php: 7.0
-      arch: ppc64le
-      dist: xenial
-    - php: 7.1
-      arch: ppc64le
-      dist: bionic
-    - php: 7.2
-      arch: ppc64le
-      dist: bionic
-    - php: 7.4
-      arch: ppc64le
-      dist: bionic
-    - php: nightly
-      arch: ppc64le
-      dist: bionic
-
-  fast_finish: true
-
-install:
-  - if [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then travis_retry composer update; fi
-  - if [ "$TRAVIS_PHP_VERSION" == "nightly" ]; then travis_retry composer update --ignore-platform-reqs; fi
-
-script: vendor/bin/phpunit
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc71926..e3550ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+You can find newer changelog entries in [GitHub releases](https://github.com/Seldaek/jsonlint/releases)
+
 ### 1.8.1 (2020-08-13)
 
   * Added type annotations
diff --git a/composer.json b/composer.json
index b065d7b..33a6e68 100644
--- a/composer.json
+++ b/composer.json
@@ -15,10 +15,15 @@
         "php": "^5.3 || ^7.0 || ^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+        "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13",
+        "phpstan/phpstan": "^0.12.59"
     },
     "autoload": {
         "psr-4": { "Seld\\JsonLint\\": "src/Seld/JsonLint/" }
     },
-    "bin": ["bin/jsonlint"]
+    "bin": ["bin/jsonlint"],
+    "scripts": {
+        "test": "vendor/bin/phpunit",
+        "phpstan": "vendor/bin/phpstan analyse"
+    }
 }
diff --git a/debian/changelog b/debian/changelog
index 83dd1fe..6725236 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jsonlint (1.8.3+git20210415.1.a094f1a-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sun, 20 Mar 2022 08:08:07 -0000
+
 jsonlint (1.8.3-2) unstable; urgency=medium
 
   * Adapt to recent version of PHPUnit (9)
diff --git a/debian/patches/0001-Use-homemade-autoload.patch b/debian/patches/0001-Use-homemade-autoload.patch
index a25f278..2a33752 100644
--- a/debian/patches/0001-Use-homemade-autoload.patch
+++ b/debian/patches/0001-Use-homemade-autoload.patch
@@ -9,10 +9,10 @@ Forwarded: not-needed
  bin/jsonlint | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/bin/jsonlint b/bin/jsonlint
-index 8af29eb..ee8ea93 100755
---- a/bin/jsonlint
-+++ b/bin/jsonlint
+Index: jsonlint/bin/jsonlint
+===================================================================
+--- jsonlint.orig/bin/jsonlint
++++ jsonlint/bin/jsonlint
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env php
 +#!/usr/bin/php
diff --git a/debian/patches/0002-Try-to-re-enable-8.1-build-using-phpunit-9.patch b/debian/patches/0002-Try-to-re-enable-8.1-build-using-phpunit-9.patch
index 45dc018..d352d69 100644
--- a/debian/patches/0002-Try-to-re-enable-8.1-build-using-phpunit-9.patch
+++ b/debian/patches/0002-Try-to-re-enable-8.1-build-using-phpunit-9.patch
@@ -7,10 +7,10 @@ Origin: backport, https://github.com/Seldaek/jsonlint/commit/62cb5df89677559cefb
  tests/JsonParserTest.php | 27 ++++++++++++++++++---------
  1 file changed, 18 insertions(+), 9 deletions(-)
 
-diff --git a/tests/JsonParserTest.php b/tests/JsonParserTest.php
-index 5f3296f..df2d3c9 100644
---- a/tests/JsonParserTest.php
-+++ b/tests/JsonParserTest.php
+Index: jsonlint/tests/JsonParserTest.php
+===================================================================
+--- jsonlint.orig/tests/JsonParserTest.php
++++ jsonlint/tests/JsonParserTest.php
 @@ -69,7 +69,7 @@ class JsonParserTest extends TestCase
  }');
              $this->fail('Invalid trailing comma should be detected');
diff --git a/phpstan-config.neon b/phpstan.neon.dist
similarity index 100%
rename from phpstan-config.neon
rename to phpstan.neon.dist