diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9f37fd9b74..d93a04cb4b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,26 +10,23 @@ jobs:
         racket-variant: ["BC", "CS"]
     steps:
       - uses: actions/checkout@master
-      - uses: Bogdanp/setup-racket@v0.13
+      - uses: Bogdanp/setup-racket@v1.8.1
         with:
           architecture: x64
           distribution: full
           variant: ${{ matrix.racket-variant }}
           version: current
+          dest: '"${HOME}/racketdist-${{ matrix.racket-variant }}"'
+          local_catalogs: $GITHUB_WORKSPACE
+          sudo: never
 
-      # This next step was copied from the CI config for Typed Racket:
-      # https://github.com/racket/typed-racket/blob/master/.github/workflows/ci.yml
       - run: |
-             sudo raco pkg install --auto -i --no-setup --skip-installed scribble-test
-             racket -l- pkg/dirs-catalog --link --check-metadata pkgs-catalog .
-             echo file://`pwd`/pkgs-catalog/ > catalog-config.txt
-             raco pkg config catalogs >> catalog-config.txt
-             sudo raco pkg config --set catalogs `cat catalog-config.txt`
-             sudo raco pkg update -i --auto --no-setup scribble-text-lib/ scribble-html-lib/ scribble-lib/ scribble-doc/ scribble-test/
+          raco pkg install -i --auto --no-setup --skip-installed scribble-test
+          raco pkg update --auto --no-setup scribble-text-lib scribble-html-lib scribble-lib scribble-doc scribble-test
 
       # This uses --pkgs so that we don't have to figure out which collections
       # each package adds modules to.
-      - run: sudo raco setup --check-pkg-deps --pkgs scribble-text-lib scribble-html-lib scribble-lib scribble-doc scribble-test
+      - run: raco setup --check-pkg-deps --pkgs scribble-text-lib scribble-html-lib scribble-lib scribble-doc scribble-test
 
       # Tests are run with --drdr to help keep racket's CI systems consistent
       # with each other.
diff --git a/.github/workflows/resyntax.yml b/.github/workflows/resyntax.yml
new file mode 100644
index 0000000000..9126b011df
--- /dev/null
+++ b/.github/workflows/resyntax.yml
@@ -0,0 +1,35 @@
+name: Resyntax
+
+on:
+  pull_request:
+    types:
+      - opened
+      - edited
+      - reopened
+      - synchronize
+      - ready_for_review
+
+jobs:
+  build:
+    name: Analyze pull request
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    steps:
+      - uses: actions/checkout@v2
+        # See https://github.com/actions/checkout/issues/118.
+        with:
+          fetch-depth: 0
+      - uses: Bogdanp/setup-racket@v1.8.1
+        with:
+          version: current
+          packages: resyntax
+          local_catalogs: $GITHUB_WORKSPACE
+          dest: '"${HOME}/racketdist-current-CS"'
+          sudo: never
+      - run: |
+          raco pkg install -i --auto --no-setup --skip-installed scribble-test
+          raco pkg update --auto --no-setup scribble-text-lib scribble-html-lib scribble-lib scribble-doc scribble-test
+      - run: raco setup --pkgs scribble-text-lib scribble-html-lib scribble-lib scribble-doc scribble-test
+      - run: xvfb-run racket -l- resyntax/cli analyze --local-git-repository . "origin/${GITHUB_BASE_REF}" --output-as-github-review