diff --git a/sql/Makefile b/sql/Makefile
--- a/sql/Makefile
+++ b/sql/Makefile
@@ -3,7 +3,7 @@
 DBNAME = softwareheritage-dev
 DOCDIR = autodoc
 
-SQL_FILES = $(sort $(wildcard $(CURDIR)/../swh/storage/sql/*))
+SQL_FILES = $(sort $(wildcard $(CURDIR)/../swh/storage/sql/*.sql))
 
 PSQL_BIN = psql
 PSQL_FLAGS = --echo-errors -X -v ON_ERROR_STOP=1
diff --git a/sql/bin/dot_add_content b/sql/bin/dot_add_content
--- a/sql/bin/dot_add_content
+++ b/sql/bin/dot_add_content
@@ -2,7 +2,7 @@
 
 DOT_FILE="$1"
 DOT_EXTRA="$2"
-SQL_SCHEMA="../swh/storage/sql/30-swh-schema.sql"
+SQL_SCHEMA="../swh/storage/sql/30-schema.sql"
 if [ -z "$DOT_FILE" -o -z "$DOT_EXTRA" ] ; then
     echo "Usage: $0 DOT_FILE DOT_EXTRA"
     exit 1