diff --git a/scripts/lib/build-pgroonga b/scripts/lib/build-pgroonga
index 122880a058..ce589262f5 100755
--- a/scripts/lib/build-pgroonga
+++ b/scripts/lib/build-pgroonga
@@ -1,14 +1,17 @@
 #!/usr/bin/env bash
-set -x
-set -e
+set -euxo pipefail
 
-PGROONGA_VERSION="2.2.8"
+version="2.3.6"
+sha256=fc68a66a216e304bb0e2ef627f767fff528f4fbf2bbda27e8cd8db1b7ba090b0
 
-cd "$(mktemp -d)"
+tmpdir="$(mktemp -d)"
+trap 'rm -r "$tmpdir"' EXIT
+cd "$tmpdir"
+tarball="pgroonga-$version.tar.gz"
+curl -fLO "https://packages.groonga.org/source/pgroonga/$tarball"
+sha256sum -c <<<"$sha256 $tarball"
+tar -xzf "$tarball"
+cd "pgroonga-$version"
 
-curl -fLO https://packages.groonga.org/source/pgroonga/pgroonga-"$PGROONGA_VERSION".tar.gz
-tar xf pgroonga-"$PGROONGA_VERSION".tar.gz
-cd pgroonga-"$PGROONGA_VERSION"
-
-make HAVE_MSGPACK=1
+make -j "$(nproc)" HAVE_MSGPACK=1
 make install
diff --git a/tools/lib/provision.py b/tools/lib/provision.py
index 4bbe030fc5..5455172cad 100755
--- a/tools/lib/provision.py
+++ b/tools/lib/provision.py
@@ -174,8 +174,7 @@ if vendor == "debian" and os_version in [] or vendor == "ubuntu" and os_version
         f"postgresql-server-dev-{POSTGRESQL_VERSION}",
         "libgroonga-dev",
         "libmsgpack-dev",
-        "clang-9",
-        "llvm-9-dev",
+        "clang",
         *VENV_DEPENDENCIES,
     ]
 elif "debian" in os_families():