diff --git a/packages/pacman/build.sh b/packages/pacman/build.sh
index 0047bd3a9..047e1fb79 100644
--- a/packages/pacman/build.sh
+++ b/packages/pacman/build.sh
@@ -3,12 +3,13 @@ TERMUX_PKG_DESCRIPTION="A library-based package manager with dependency support"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@Maxython"
 TERMUX_PKG_VERSION=6.0.1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://sources.archlinux.org/other/pacman/pacman-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731
 TERMUX_PKG_DEPENDS="bash, libarchive, curl, gpgme"
 TERMUX_PKG_BUILD_DEPENDS="doxygen, asciidoc, nettle"
 TERMUX_PKG_GROUPS="base-devel"
+TERMUX_PKG_CONFFILES="etc/pacman.conf etc/makepkg.conf"
 
 # A temporary solution to the problem with compiling the documentation.
 # https://github.com/termux/termux-packages/pull/7759#issuecomment-945664581
@@ -31,5 +32,6 @@ termux_step_create_debscripts() {
 	echo "#!$TERMUX_PREFIX/bin/bash" > postinst
 	echo "mkdir -p $TERMUX_PREFIX/var/lib/pacman/sync" >> postinst
 	echo "mkdir -p $TERMUX_PREFIX/var/lib/pacman/local" >> postinst
+	echo "mkdir -p $TERMUX_PREFIX/var/cache/pacman/pkg" >> postinst
 	chmod 755 postinst
 }
diff --git a/packages/pacman/pacman.conf.in.patch b/packages/pacman/pacman.conf.in.patch
index e5997f24f..0b3b0cce1 100644
--- a/packages/pacman/pacman.conf.in.patch
+++ b/packages/pacman/pacman.conf.in.patch
@@ -53,10 +53,10 @@ diff -uNr pacman-6.0.0/etc/pacman.conf.in pacman-termux/etc/pacman.conf.in
  
  #
  # REPOSITORIES
-@@ -60,18 +65,12 @@
+@@ -60,18 +65,15 @@
  # uncommented to enable the repo.
  #
- 
+
 -# An example of a disabled remote package repository with multiple servers
 -# available. To enable, uncomment the following lines. You can add preferred
 -# servers immediately after the header and they will be used before the
@@ -77,7 +77,10 @@ diff -uNr pacman-6.0.0/etc/pacman.conf.in pacman-termux/etc/pacman.conf.in
 +# after the header, and they will be used before the default mirrors.
 +
 +[main]
-+Server = https://maxython.github.io/termux-packages-in-pacman-format/main/$arch
++Server = https://s3.amazonaws.com/termux-main.pacman/$arch
 +
 +[x11]
-+Server = https://maxython.github.io/termux-packages-in-pacman-format/x11/$arch
++Server = https://s3.amazonaws.com/termux-x11.pacman/$arch
++
++[root]
++Server = https://s3.amazonaws.com/termux-root.pacman/$arch