diff --git a/puppet/zulip/manifests/postgresql_base.pp b/puppet/zulip/manifests/postgresql_base.pp
index d167f2b057..bf24fc2726 100644
--- a/puppet/zulip/manifests/postgresql_base.pp
+++ b/puppet/zulip/manifests/postgresql_base.pp
@@ -75,7 +75,14 @@ class zulip::postgresql_base {
   $pgroonga = zulipconf('machine', 'pgroonga', '')
   if $pgroonga == 'enabled' {
     # Needed for optional our full text search system
+
+    # Removed 2020-12 in version 4.0; these lines can be removed when
+    # we drop support for upgrading from Zulip 3 or older.
     package{"${postgresql}-pgroonga":
+      ensure  => 'purged',
+    }
+
+    package{"${postgresql}-pgdg-pgroonga":
       ensure  => 'installed',
       require => [Package[$postgresql],
                   Exec[$setup_system_deps]],
@@ -83,7 +90,7 @@ class zulip::postgresql_base {
 
     file { $pgroonga_setup_sql_path:
       ensure  => file,
-      require => Package["${postgresql}-pgroonga"],
+      require => Package["${postgresql}-pgdg-pgroonga"],
       owner   => 'postgres',
       group   => 'postgres',
       mode    => '0640',
diff --git a/scripts/lib/setup-apt-repo b/scripts/lib/setup-apt-repo
index af6423fdbf..ee99e8c276 100755
--- a/scripts/lib/setup-apt-repo
+++ b/scripts/lib/setup-apt-repo
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -x
 set -e
+set -u
+set -o pipefail
 
 # Ensure the directory for LAST_DEPENDENCIES_HASH exists
 mkdir -p /var/lib/zulip
@@ -27,16 +29,17 @@ touch "$SOURCES_FILE"
 # Hash it to check if the sources file is changed by the script later.
 zulip_source_hash=$(sha1sum "$SOURCES_FILE")
 
-pre_setup_deps=(lsb-release apt-transport-https ca-certificates gnupg)
+pre_setup_deps=(lsb-release apt-transport-https ca-certificates gnupg wget)
 if ! apt-get -dy install "${pre_setup_deps[@]}"; then
     apt-get update
 fi
 apt-get -y install "${pre_setup_deps[@]}"
 
-SCRIPTS_PATH="$(dirname "$(dirname "$0")")"
+SCRIPTS_PATH="$(cd "$(dirname "$(dirname "$0")")" && pwd)"
 
 release=$(lsb_release -sc)
 if [[ "$release" =~ ^(bionic|cosmic|disco|eoan|focal)$ ]]; then
+    distribution=ubuntu
     apt-key add "$SCRIPTS_PATH"/setup/pgdg.asc
     apt-key add "$SCRIPTS_PATH"/setup/pgroonga-ppa.asc
     cat >$SOURCES_FILE <<EOF
@@ -47,20 +50,53 @@ deb http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
 deb-src http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
 EOF
 elif [[ "$release" =~ ^(buster)$ ]]; then
+    distribution=debian
     apt-key add "$SCRIPTS_PATH"/setup/pgdg.asc
-    apt-key add "$SCRIPTS_PATH"/setup/pgroonga-debian.asc
     cat >$SOURCES_FILE <<EOF
 deb http://apt.postgresql.org/pub/repos/apt/ $release-pgdg main
 deb-src http://apt.postgresql.org/pub/repos/apt/ $release-pgdg main
-
-deb https://packages.groonga.org/debian/ $release main
-deb-src https://packages.groonga.org/debian/ $release main
 EOF
 else
     echo "Unsupported release $release."
     exit 1
 fi
 
+if [[ ! -e /usr/share/doc/groonga-apt-source/copyright ]]; then
+    remove_pgroonga_apt_tmp_dir() {
+        rm -rf "$pgroonga_apt_tmp_dir"
+    }
+    pgroonga_apt_tmp_dir=$(mktemp --directory)
+    trap remove_pgroonga_apt_tmp_dir EXIT
+    pushd "$pgroonga_apt_tmp_dir"
+    tmp_gpg_home=.gnupg
+    pgroonga_apt_sign_key="$SCRIPTS_PATH"/setup/pgroonga-packages.groonga.org.asc
+    gpg --homedir="$tmp_gpg_home" --import "$pgroonga_apt_sign_key"
+    # Find fingerprint of the first key.
+    pgroonga_apt_sign_key_fingerprint=$(
+        gpg --homedir="$tmp_gpg_home" --with-colons --list-keys \
+            | grep '^fpr:' \
+            | cut --delimiter=: --fields=10 \
+            | head --lines=1
+    )
+    groonga_apt_source_deb="groonga-apt-source-latest-$release.deb"
+    groonga_apt_source_deb_sign="$groonga_apt_source_deb.asc.$pgroonga_apt_sign_key_fingerprint"
+    wget "https://packages.groonga.org/$distribution/$groonga_apt_source_deb"
+    wget "https://packages.groonga.org/$distribution/$groonga_apt_source_deb_sign"
+    gpg \
+        --homedir="$tmp_gpg_home" \
+        --verify \
+        "$groonga_apt_source_deb_sign" \
+        "$groonga_apt_source_deb"
+    # To suppress the following warning by "apt-get install":
+    #   N: Download is performed unsandboxed as root as file
+    #   '.../groonga-apt-source-latest-$release.deb' couldn't be
+    #   accessed by user '_apt'. - pkgAcquire::Run (13: Permission denied)
+    chown _apt .
+    apt-get -y install "./$groonga_apt_source_deb"
+    popd
+    touch "$STAMP_FILE"
+fi
+
 if [ "$zulip_source_hash" = "$(sha1sum "$SOURCES_FILE")" ] && ! [ -e "$STAMP_FILE" ]; then
     echo "zulip.list file did not change; skipping apt-get update"
 else
diff --git a/scripts/setup/pgroonga-debian.asc b/scripts/setup/pgroonga-debian.asc
deleted file mode 100644
index 8f825d87a6..0000000000
--- a/scripts/setup/pgroonga-debian.asc
+++ /dev/null
@@ -1,91 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBE+blD8RBADbroKpVSeEIZaiu0Gemdb7+JOpffD/IkcKPqeSISh0hR5kSRgk
-8HGLk+wgdvXWl2ndWY50b3mfBSTxNViFwcByRM7qS+b0Gi1T9y1knn6Jo3eWm+3N
-aI97JXgAOlVV0E7B9B4K2qDyfLrmQiU7apHhpXoXA9Js+ScozI8XbcO5awCg9kPx
-7StmiNGr6gvROb1rZx8MxEcD+wRh+oTyDMF+oTtN61E6y+avuSiI2Cx5UBPUGnuU
-y4AzniK5Xj6rqZ2MY+M05XgIJW+c/vN1DlJZIFi52AEOcWYODcIbouk9qFLDqP7z
-OyDK1bvaBRjCr3siuroQyfjXb8BldzR+HMt/4+PD3Zm2OQ9azRaW1jCUP+SuR4N7
-Xdd7A/9WGs3KUjhMFEpiDTbjBxwFa9NfoFxvZOhTGlQOsKYKcnCgnBIa51JFzHl8
-fSE6T/kXQ2LQAChxehtxEi+0WvWnUw7m8Y7EXkQ427jcUzbjxVZ67Ys2hcX+9Rl6
-rIbTnCy/oJRrEDbhTDhjhbMZgskWEVl7LguxW5y2WL/snj8E7bRBZ3Jvb25nYSBL
-ZXkgKGdyb29uZ2EgT2ZmaWNpYWwgU2lnbmluZyBLZXkpIDxwYWNrYWdlc0Bncm9v
-bmdhLm9yZz6IYgQTEQIAIgUCT5uUPwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgEC
-F4AACgkQcqdJa0VJlCnCeQCeNNMnOiri+zdLBU3EmBBuZZFet44AmgPwGZHfgA1r
-SrzymknxZI07SFIssAIAA4hGBBARAgAGBQJPqnFoAAoJEBdCP2Qcg38xVycAoNmX
-iePu4ii0o4qOd8WrsYI133S/AJ9sAExpw/89F5toiKqh4XEb2AaGnrACAACJAhwE
-EAECAAYFAk+qcakACgkQkdGPzwefgAco7Q/7BkYIuIHsZVHXrPSyloeuAW9Aqfxt
-U1iZ+ifBifT244PRR0HcCK9XnlJOua/jycLPwG89QTQ/0MuZTT5rtF3Plph2QMYq
-pAmTH+5zWN/en1v6KRvHyqBRJkrlNSyKVlwWlOCwQNkAm11zmTZBDoLqth7wMPyl
-c9GB+aCqxoh+tvxd2DzRzwrxc5lHcVAL+wRB1GJanE0GBZdOBfo8AejsKLzenWFb
-iC5iUV6BKhjX6nAsZoL0AuFGNfAwyyOkCpOaBuQG1DDDeJb/Kw3m46XKg8kbe60l
-OM7JGQfRKBNBHZqbBOQwQCkXZs5xnLPlxKVk9ExykQCn+nbNH3otCzcIzpSJg6gA
-JGT4FPvK9BhDeYwrfTZ9wh4R6rexrXHibq71IvljNfXfjOCwM51xdgP0P7+WwlX5
-+8Nr8DUIXGbNoxkHv/h7XcIh9Qva722gdkFzEbwtGQ5yRc7YFO4GvZjW7S0iAN6a
-hB4hfCiJN4GC4xI3yBP7wGmmQbAJKhpvVdS/gTfWBHMTQRTZKFnIiPtd1DWoqT7K
-tUFQuGl7FEUWODI73HM7iibGu0HqG4UtsM1GGqop4RULQ/JcEXJcLifaGBW6fP9S
-SJYg+IqlgQx6lwsIgFVL0fsSDicPx6OlMWnCu/e4mwoStA6EM2KbfSy56qFECoQi
-b/tFBQrajwfR9sWwAgAAiQIcBBABAgAGBQJPvHGKAAoJENIsGog0VdRICFsP/j9Q
-enxWaiMAfLQOaC2wpLW4BrEmdkhbs4qSeAfFwof/jO7vehmYkda6RHHVtE5xN6UQ
-tTFUuLqLwNaMdz6sgBi1jc/02oYcajxLJENwAk3o3GaSfadd6HeMLKrqyf8rA1eY
-Bs3/6F2MEpPMCvfZTddMFPyGfhstjvgzxBUoxbW7sCqj2kEci14azVFhf8jijStF
-EFQVr1eh3oAaJjlOi5/uGB+H3yz8kRONBFyvLaBRSLepI3/5rU2wC0ItvlCISvdf
-PCsOF7A8ho9N+cSpqym7zGA3u6kValmrLz/w7BRgbPX52MCh0ULBmarge0U+X6c1
-D0Z/o3wxt5a0EApW8FN3WJK1vhV+cyTjAqJIO+B3c8hDfr7C7/4fcSSHdzdiPsg9
-TgVIq36Q7Fl/cqR4hx2QGNr7ErZMzXLXuMK7ZFqQ9hqDBmS8r/E0z+ze53BTG52q
-W5jjxdtc6l+KB29FnE5K+8EmuiR9dVbdrhV5DlrYNjiQG/pAtq8NdHh+yd3Q8mME
-yd45shAZQM9LdiAW0AmNCjUCQzTbHbSHbaoE7V5qZcHznRNJ00l2zCGuJeW9aTjp
-7gN3E+jtp54s03EGaxahwxIatI9bGKCxHPDF3zwGCweOh7ywYWap+7bF9WlOOgOL
-+IKjX9Jn7c8RC5PzWHQLR4941zCQWMiHeFQvxnLKsAIAAJkCDQRabqOPARAAv+FK
-JmXGbdsIw2+FqBRsVcQyEmn+JP8ZYkAs91ddQhzedyH93RrKozkKyU0abuXrlxKH
-nG9GIolFiNvHg9SGo067rpxg4yOu9v7t/okehmtcJO54mv+bZaOCzGJeb2vwUJMV
-SMfeTnKBwYeOpaFQJ22qvjsn1fq/XSCyVH9bcQCeuUSBmUopIJKEgqFZ0cDYYS6O
-LLLuuTOqOJUbCOnVD/MKZ8vHSvBKUZUsK24nK5ZfpQQ8RWSIdTipZdruame5rUCj
-jGwsFYYpXch63VBtTyOMpyCA7/f/K/ln+MHqAqpZ7CnSq3h3/fdMlnXtKkjE2Z8o
-yX8mPKSjT5M9nFhyqcYis+g2g0lyQP7KAAJp3kYd+9C9PqvWG1C/0ymt4gZjWTmo
-icUvsNqbeJ+2dBj6HM+ejLRh2NMy6ZZq5v/s/GwR/lb9TA0BLdYSBPn3QdrRiAwo
-I73oBFUXJAnVm+mR3kb3JhO/1SqGNBmWQttPPABMnOh3fegdDVhA6aKAxU35GmeS
-FXNVVtyuxRepdF5vvXy85i+y/L8wJzGQ+cQdQJw8P1qIsex5e7k3VVwZRVnJIrlN
-jfN5rU/yH5bCt6AX2e1FSSVs14mNYhohA5gKpxDZkojfgzShmbrCTO+awnFDOO1y
-MQtbVfm2G1X/06D3Zl35+RJUfZzI5e+42PkxJqkAEQEAAbRBR3Jvb25nYSBLZXkg
-KEdyb29uZ2EgT2ZmaWNpYWwgU2lnbmluZyBLZXkpIDxwYWNrYWdlc0Bncm9vbmdh
-Lm9yZz6JAk4EEwEIADgWIQQnAfMXz8zLl1yt6cJiTPd0NIOSJQUCWm6jjwIbAwUL
-CQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRBiTPd0NIOSJb+SD/9CvmBD9OdRB/Nk
-f/Rdiq4XOPnCP5La66i5NXb7IZKVOZuY3PqfGJ43XPTq6qBKLSlCAwkFbclXZP2z
-lne+bYAknHJbJbFy3aceoRmAOnkSgFeMj7V0J0nfBbrUForvaaGjDzIDgx/G3/D7
-gxq5C4zYXQNGbi39XommyDveB2hdaNbWdI1YOlG2fDMC7S4VPaMfNVYxDzrLBokf
-DAgYB2QsYX3toEkdZpsQxPXfNCm9g2G+JApHtjI6EpLtEodgbSJf/Rp9lRqeRNZJ
-X/lUY6MSujI73n2O8huZklgbBPGJioaJc1Q+EFEl1mNHt3nfCz7d/FlzON3lCbdb
-g+X3fl6FX00fmUmlNj/XBG2G/InnNt7dgH1x6MIaTnFKsi0p0xj3U3lZmUJqei0o
-7SAGMM+QY3at5A5D2YpGChmMpGLqDuICLjogQqFhClIpfm0yBt3lNa3wi41rFr0y
-X5rMawfYV/g4y0FDT+xh/wxgMcLeKErtIYZRq6QLNYq9PSniEK3gssPsj/LdshcE
-OC6NuuENXrgJdvQ2rgfI3wM0uFVUelNPE6cbc680waSoCNMGPl4Nk4ExtSa3WRQG
-H4J6aZHkX8L6aWedRCoLTLQ2LB49Ow7Ol3KE66XfU7Y+JBfznvGPMYOzZEZjxdwl
-ytR0bHU5H6b0dpVBDCgojAVphRlpyLACAAOIXQQQEQgAHRYhBMl+RkmiBR0M6hpz
-+XKnSWtFSZQpBQJabssTAAoJEHKnSWtFSZQprgsAoKAistI/y3CMRyarH1va32fj
-HNiyAJ9i7XDqQTBbrT1yMhISjrE9lscr3LACAAO5Ag0EWm6jjwEQALUgeK8Dm49G
-cenJZS6WOPBFDfxMZM24d4NbRcbJyGJ9RJoky4CQTY42QbAJ4V3bC/p9kD9hW/w6
-aeDB6G8EuV4NQJL0A1dy5AD0N4fVmYDTfbNze0DzJSrs1eCwhExYDGgvcR36tlrm
-K9ZMvzq85ej1mQ/g8iUPgPPkpFI5BtgPHKlHghyDmK/JYcFwLmjz0R1cbsKPWEXM
-AdESq5UojBH51xnXMKwB3aUHyU2gO7iqQxf5p1lXPMOX4ssnMuiz3DGWUkaQhy1s
-gJZtzYiX3To1NTijbdSKlRJ+CXlG/vFagexgDWfMYrjbcmLQllKNt+Sc0FPUcUqG
-tXKFxSI0ny3tUv+eTF8d5kqSaJk67nfHB6abxLjmXLoUMwMtlnyKPxHpKXJEe7+U
-lTDo8UGT8ZILscftAWZPW2WLn8FOCXQQcIDG/G/7Adi374u/WQpOhi5Y86MPnbLV
-53Bx2pP+XTbYDKFc/2wfKOVpxLHDDWCIsM3DL7YY63B1pSt5B3lJUnvjxuHhXtWN
-G9UIgkaFCzvY8jgAXIVBnWAJcdkruUCwOD0tXmK45YPyK7fNLte4kWcOLxoh7rND
-qo/wUyK9pB5G/CdE8J1G+T+egF+6qUM9IEIR8OJWQt9uR00ogMXdCAVztm4ZImX6
-boiW5SbWEzHnzv4mdH0WlbQtzjrKkwClABEBAAGJAjYEGAEIACAWIQQnAfMXz8zL
-l1yt6cJiTPd0NIOSJQUCWm6jjwIbDAAKCRBiTPd0NIOSJXtkD/9IthyF6CnQBazM
-QO/JIHp3Kfe/9ll+4hSSSc9tpijYznXpNQVv3rQQwVooL3oV5XoATK8H6kv2IOyh
-tGq2szMt9YQ2JuGdjcOb5Mc2A+QWD3Tn7KCcwpIdOWiL74EWBKX6yM5JG103nI0X
-y1W5FSyCJ6lB1xDoCKgUdqrgfEwAgkt8kDeoi57j9wYilt2d5+UK85pXqNgOMKxR
-0tLCHcngN1XKq4irfjBVVlh205qjsTApVzLrYYe0nGae/yejmGwCLMu37yd/XiNf
-jMi56gEYvIU/ZehqJQf00O4Cmneggu5A+KCG7cEULtuPLcwUho7swdsm+bTCNAAM
-CvhSFeTUAs1atIOIsw1rStonPPOvjd0Ig3qWyaVs2PgK8xh21aLg5tIXmn2bTegc
-mFJGGfv6YAkkPAKqtjJ/RPVZZH93PzouR590dAX/mZWZYRfo6ipxgv6ALhL51z7l
-E/Zqcdg7TSkG2tY2NJnoXLROpXg9Bs7gFkb6ia7YeSJTz3Q0uBbQMqWkQyrj1RB8
-i18m28J9/OkLiSryhsyLh4UULqm7PUNyNKMV31TaIBQVvutKtLZ/GLWmPc/tBSa3
-Uy5CBG5oTrh1xo/3ZO0JRUW2CYU+gMvTRowmLP2uhU7JOAtz3QAerpHpNhtRdfPs
-0HAz6RfxSr0qk9eQec/UPhOATDujkLACAAM=
-=IBdD
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts/setup/pgroonga-packages.groonga.org.asc b/scripts/setup/pgroonga-packages.groonga.org.asc
new file mode 100644
index 0000000000..e8cb3e53d3
--- /dev/null
+++ b/scripts/setup/pgroonga-packages.groonga.org.asc
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=7PCC
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/tools/lib/provision.py b/tools/lib/provision.py
index 192489c481..58bc3c36be 100755
--- a/tools/lib/provision.py
+++ b/tools/lib/provision.py
@@ -177,7 +177,7 @@ elif "debian" in os_families():
     SYSTEM_DEPENDENCIES = [
         *UBUNTU_COMMON_APT_DEPENDENCIES,
         f"postgresql-{POSTGRESQL_VERSION}",
-        f"postgresql-{POSTGRESQL_VERSION}-pgroonga",
+        f"postgresql-{POSTGRESQL_VERSION}-pgdg-pgroonga",
         *VENV_DEPENDENCIES,
     ]
 elif "rhel" in os_families():
@@ -186,7 +186,7 @@ elif "rhel" in os_families():
         f"postgresql{POSTGRESQL_VERSION}-server",
         f"postgresql{POSTGRESQL_VERSION}",
         f"postgresql{POSTGRESQL_VERSION}-devel",
-        f"postgresql{POSTGRESQL_VERSION}-pgroonga",
+        f"postgresql{POSTGRESQL_VERSION}-pgdg-pgroonga",
         *VENV_DEPENDENCIES,
     ]
 elif "fedora" in os_families():
diff --git a/version.py b/version.py
index 4984bda7fc..01e915ee51 100644
--- a/version.py
+++ b/version.py
@@ -43,4 +43,4 @@ API_FEATURE_LEVEL = 35
 #   historical commits sharing the same major version, in which case a
 #   minor version bump suffices.
 
-PROVISION_VERSION = '118.0'
+PROVISION_VERSION = '118.1'