diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 4f539b0df9f..349e0c92ac1 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
 version=14
-revision=1
+revision=2
 build_style=meta
 depends="postgresql${version}"
 short_desc="PostgreSQL server meta package"
@@ -11,18 +11,23 @@ homepage="https://www.postgresql.org"
 
 build_options="languages"
 desc_option_languages="Include procedural languages as dependency"
+
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="languages"
 fi
 
+subpackages="postgresql-doc postgresql-client postgresql-contrib postgresql-full"
+
+# XXX disabled for now in cross builds.
+if [ "$build_option_languages" ]; then
+	subpackages+=" postgresql-plperl postgresql-plpython postgresql-pltcl"
+fi
+
 postgresql-doc_package() {
 	depends="postgresql${version}-doc"
 	short_desc="PostgreSQL documentation meta package"
 }
 
-# XXX disabled for now in cross builds.
-if [ "$build_option_languages" ]; then
-
 postgresql-plperl_package() {
 	depends="postgresql${version}-plperl"
 	short_desc="PL/Perl language meta package"
@@ -38,8 +43,6 @@ postgresql-pltcl_package() {
 	short_desc="PL/Tcl language meta package"
 }
 
-fi # build_option_languages
-
 postgresql-client_package() {
 	depends="postgresql${version}-client"
 	short_desc="Client frontends programs for PostgreSQL"
@@ -50,7 +53,7 @@ postgresql-contrib_package() {
 	short_desc="PostgreSQL contributed programs and extensions"
 }
 
-postgresql-full() {
+postgresql-full_package() {
 	depends="postgresql postgresql-client postgresql-doc postgresql-contrib postgresql-libs"
 	short_desc="PostgreSQL all packages meta package"