diff --git a/index/gn/gnatcoll_postgres/gnatcoll_postgres-21.0.0.toml b/index/gn/gnatcoll_postgres/gnatcoll_postgres-21.0.0.toml
new file mode 100644
index 00000000..7d0624bd
--- /dev/null
+++ b/index/gn/gnatcoll_postgres/gnatcoll_postgres-21.0.0.toml
@@ -0,0 +1,23 @@
+name = "gnatcoll_postgres"
+version = "21.0.0"
+description = "GNAT Components Collection - postgres"
+website = "https://github.com/adacore/gnatcoll-db"
+authors = ["AdaCore"]
+licenses = ["GMGPL 3.0"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+project-files = ["postgres/gnatcoll_postgres.gpr"]
+tags = ["gnatcoll", "gnatcoll-db", "postgres", "postgresql", "database"]
+
+[gpr-externals]
+GNATCOLL_BUILD_MODE = ["DEBUG", "PROD"]
+LIBRARY_TYPE = ["static", "relocatable", "static-pic"]
+
+[[depends-on]]
+gnatcoll = "~21.0.0"
+gnatcoll_sql = "~21.0.0"
+postgresql = "*"
+
+[origin]
+url="https://github.com/AdaCore/gnatcoll-db/archive/v21.0.0.zip"
+hashes=['sha512:d9ce18f37a7d20a1489d4fd840f93d673e6b75e33eb120dd74b0ae0061c947c3ec2538840fa3db5ff49a49892648332ede206968facc56d87a600afbf753f6f2']
diff --git a/index/gn/gnatcoll_sql/gnatcoll_sql-21.0.0.toml b/index/gn/gnatcoll_sql/gnatcoll_sql-21.0.0.toml
new file mode 100644
index 00000000..f3728a28
--- /dev/null
+++ b/index/gn/gnatcoll_sql/gnatcoll_sql-21.0.0.toml
@@ -0,0 +1,21 @@
+name = "gnatcoll_sql"
+version = "21.0.0"
+description = "GNAT Components Collection - sql"
+website = "https://github.com/adacore/gnatcoll-db"
+authors = ["AdaCore"]
+licenses = ["GMGPL 3.0"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+project-files = ["sql/gnatcoll_sql.gpr"]
+tags = ["gnatcoll", "gnatcoll-db", "sql", "database"]
+
+[gpr-externals]
+GNATCOLL_BUILD_MODE = ["DEBUG", "PROD"]
+LIBRARY_TYPE = ["static", "relocatable", "static-pic"]
+
+[[depends-on]]
+gnatcoll = "~21.0.0"
+
+[origin]
+url="https://github.com/AdaCore/gnatcoll-db/archive/v21.0.0.zip"
+hashes=['sha512:d9ce18f37a7d20a1489d4fd840f93d673e6b75e33eb120dd74b0ae0061c947c3ec2538840fa3db5ff49a49892648332ede206968facc56d87a600afbf753f6f2']
diff --git a/index/gn/gnatcoll_sqlite/gnatcoll_sqlite-21.0.0.toml b/index/gn/gnatcoll_sqlite/gnatcoll_sqlite-21.0.0.toml
new file mode 100644
index 00000000..0436d01a
--- /dev/null
+++ b/index/gn/gnatcoll_sqlite/gnatcoll_sqlite-21.0.0.toml
@@ -0,0 +1,22 @@
+name = "gnatcoll_sqlite"
+version = "21.0.0"
+description = "GNAT Components Collection - sqlite"
+website = "https://github.com/adacore/gnatcoll-db"
+authors = ["AdaCore"]
+licenses = ["GMGPL 3.0"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+project-files = ["sqlite/gnatcoll_sqlite.gpr"]
+tags = ["gnatcoll", "gnatcoll-db", "sqlite", "sql", "database"]
+
+[gpr-externals]
+GNATCOLL_BUILD_MODE = ["DEBUG", "PROD"]
+LIBRARY_TYPE = ["static", "relocatable", "static-pic"]
+
+[[depends-on]]
+gnatcoll = "~21.0.0"
+gnatcoll_sql = "~21.0.0"
+
+[origin]
+url="https://github.com/AdaCore/gnatcoll-db/archive/v21.0.0.zip"
+hashes=['sha512:d9ce18f37a7d20a1489d4fd840f93d673e6b75e33eb120dd74b0ae0061c947c3ec2538840fa3db5ff49a49892648332ede206968facc56d87a600afbf753f6f2']
diff --git a/index/gn/gnatcoll_xref/gnatcoll_xref-21.0.0.toml b/index/gn/gnatcoll_xref/gnatcoll_xref-21.0.0.toml
new file mode 100644
index 00000000..be0b8cb4
--- /dev/null
+++ b/index/gn/gnatcoll_xref/gnatcoll_xref-21.0.0.toml
@@ -0,0 +1,24 @@
+name = "gnatcoll_xref"
+version = "21.0.0"
+description = "GNAT Components Collection - xref"
+website = "https://github.com/adacore/gnatcoll-db"
+authors = ["AdaCore"]
+licenses = ["GMGPL 3.0"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+project-files = ["xref/gnatcoll_xref.gpr"]
+tags = ["gnatcoll", "database", "xref", "ali"]
+
+[gpr-externals]
+GNATCOLL_BUILD_MODE = ["DEBUG", "PROD"]
+LIBRARY_TYPE = ["static", "relocatable", "static-pic"]
+
+[[depends-on]]
+gnatcoll = "~21.0.0"
+gnatcoll_iconv = "~21.0.0"
+gnatcoll_sql = "~21.0.0"
+gnatcoll_sqlite = "~21.0.0"
+
+[origin]
+url="https://github.com/AdaCore/gnatcoll-db/archive/v21.0.0.zip"
+hashes=['sha512:d9ce18f37a7d20a1489d4fd840f93d673e6b75e33eb120dd74b0ae0061c947c3ec2538840fa3db5ff49a49892648332ede206968facc56d87a600afbf753f6f2']
diff --git a/index/po/postgresql/postgresql-external.toml b/index/po/postgresql/postgresql-external.toml
new file mode 100644
index 00000000..a7314ff5
--- /dev/null
+++ b/index/po/postgresql/postgresql-external.toml
@@ -0,0 +1,11 @@
+description = "PostgreSQL relational database management system"
+name = "postgresql"
+licenses = ["PostgreSQL"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+
+[[external]]
+kind = "system"
+[external.origin."case(distribution)"]
+"debian|ubuntu" = ["postgresql"]
+msys2 = ["mingw-w64-x86_64-postgresql"]