diff --git a/main/postgresql-common/APKBUILD b/main/postgresql-common/APKBUILD
index 9b131b9119d..aae4a6de109 100644
--- a/main/postgresql-common/APKBUILD
+++ b/main/postgresql-common/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=postgresql-common
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Common files for PostgreSQL"
 url="https://www.postgresql.org/"
 arch="noarch"
@@ -39,6 +39,6 @@ openrc() {
 
 sha512sums="
 f9887e260bbcccb1a96030d3065459f1c0b4b8c50e62008ab1e0964e5b281de330e3d25b311eb88a729c23342193bedb3549913b24facd4f39c1398f819c0d8c  pg_versions
-41590b3009c2d6e3b215bd8f1fa7f06a15c382a7609b60b171dae67dd7b5f71e651a2d3f6a8af0e9376ca94200ded745ae864f0b34565c6ccd7857389574e9e5  postgresql.initd
-611cca04bdf97284bca2c85688e3512dd5fcce2c1d40dcf2082855008cbe988dccbdc589af5021a120b2de10455b3700712f99d1b60da1e10ee953516f030db5  postgresql.confd
+d7e977d2e0a358928ce6680c9ff3a3f814d305c381bf0415b6b35771f6e7f3f31b4a05db0e7cbfcab2f80c03fe5680bbc102a1b432eaadacc3b33309972b1299  postgresql.initd
+282659ab16fe3af4a31396159e8374e86174bb5c31b282f2b10cdd8f673ff36a5d25d54ac0d3710364c35b3f4e047c8549deea7276ceb44780163883766bd287  postgresql.confd
 "
diff --git a/main/postgresql-common/postgresql.confd b/main/postgresql-common/postgresql.confd
index cec10fca9d8..ed2d7cac261 100644
--- a/main/postgresql-common/postgresql.confd
+++ b/main/postgresql-common/postgresql.confd
@@ -34,12 +34,12 @@
 #   -B is the number of shared buffers (has to be at least 2x the value for -N)
 # Please read man postgres(1) for more options. Many of these options can be
 # set directly in the configuration file.
-#pg_opts="-N 512 -B 1024"
+# pg_opts="-N 512 -B 1024"
 
 # Pass extra environment variables. If you have to export environment variables
 # for the database process, this can be done here.
 # Don't forget to escape quotes.
-#env_vars="PGPASSFILE=\"/path/to/.pgpass\""
+# env_vars="PGPASSFILE=\"/path/to/.pgpass\""
 
 # Location of postmaster.log.
 #logfile="/var/log/postgresql/postmaster.log"
@@ -62,10 +62,16 @@
 # Where the data directory is located/to be created.
 #data_dir="/var/lib/postgresql/$pg_version/data"
 
-# Location of configuration files. Fallbacks to $data_dir if not defined and
-# /etc/postgresql/postgresql.conf doesn't exist.
+# Where the configuration files are localed/to be created.
+# If left at the default value and /etc/postgresql/postgresql.conf doesn't
+# exist when starting the service, it fallbacks to $data_dir.
 #conf_dir="/etc/postgresql"
 
 # Additional options to pass to initdb.
 # See man initdb(1) for available options.
-#initdb_opts="--locale=en_US.UTF-8"
+#
+# NOTE: musl libc doesn't support locales; if you use a locale other than "C"
+#   here, postgres will work, but it will still behave like with "C". You can
+#   use ICU-based collations instead of libc, but until PostgreSQL 15, ICU
+#   collation cannot be used as the (default) database collation. :(
+#initdb_opts="--encoding=UTF-8 --locale=C"
diff --git a/main/postgresql-common/postgresql.initd b/main/postgresql-common/postgresql.initd
index a4ba83c64c7..35331e3c806 100644
--- a/main/postgresql-common/postgresql.initd
+++ b/main/postgresql-common/postgresql.initd
@@ -30,7 +30,7 @@ description_setup="Initialize a new $name cluster"
 : ${conf_dir:="/etc/postgresql"}
 : ${logfile:="/var/log/postgresql/postmaster.log"}
 : ${env_vars:=}
-: ${initdb_opts:=}
+: ${initdb_opts:="--encoding=UTF-8 --locale=C"}
 : ${pg_opts:=}
 : ${port:=5432}