diff --git a/sql/Makefile b/sql/Makefile
--- a/sql/Makefile
+++ b/sql/Makefile
@@ -3,14 +3,7 @@
 DBNAME = softwareheritage-dev
 DOCDIR = autodoc
 
-SQL_INIT    = 10-swh-init.sql
-SQL_ENUMS   = 20-swh-enums.sql
-SQL_SCHEMA  = 30-swh-schema.sql
-SQL_FUNC    = 40-swh-func.sql
-SQL_INDEX   = 60-swh-indexes.sql
-SQL_TRIGGER = 70-swh-triggers.sql
-SQLS = $(SQL_INIT) $(SQL_ENUMS) $(SQL_SCHEMA) $(SQL_FUNC) $(SQL_INDEX) $(SQL_TRIGGER)
-SQL_FILES = $(abspath $(addprefix $(CURDIR)/../swh/storage/sql/,$(SQLS)))
+SQL_FILES = $(sort $(wildcard $(CURDIR)/../swh/storage/sql/*))
 
 PSQL_BIN = psql
 PSQL_FLAGS = --echo-errors -X -v ON_ERROR_STOP=1
diff --git a/sql/bin/db-upgrade b/sql/bin/db-upgrade
--- a/sql/bin/db-upgrade
+++ b/sql/bin/db-upgrade
@@ -6,8 +6,6 @@
 
 set -e
 
-SQLS="swh-*.sql"
-VERSION_SQL="swh-schema.sql"
 UPGRADE_DIR="upgrades"
 DB_NAME="softwareheritage-dev"
 
@@ -51,7 +49,7 @@
 new_dump=$(mktemp tmp.swh-db-upgrade.XXXXXXXXXX)
 trap "rm -f $old_dump $new_dump" EXIT
 
-schema_version=$(grep -i -A 1 '^insert into dbversion' "$VERSION_SQL" | tail -n 1 \
+schema_version=$(grep -hri -A 1 '^insert into dbversion' ../swh/storage/sql | tail -n 1 \
 	      | sed -e 's/.*values(//i' -e 's/,.*//')
 upgrade_script=$(mktemp -p "$UPGRADE_DIR" $(printf '%.03d' ${schema_version}).XXXX.sql)
 pg_dump_revision "$from_rev" "$old_dump"