diff --git a/MANIFEST.in b/MANIFEST.in
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,3 +6,4 @@
 include version.txt
 recursive-include sql *
 recursive-include swh/archiver/tests/data *.sql
+recursive-include swh/archiver/sql *.sql
diff --git a/sql/Makefile b/sql/Makefile
deleted file mode 100644
--- a/sql/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# Depends: postgresql-client, postgresql-autodoc
-
-DBNAME = softwareheritage-archiver-dev
-DOCDIR = autodoc
-
-SQL_INIT   = swh-init.sql
-SQL_SCHEMA = swh-archiver-schema.sql
-SQL_FUNC   = swh-archiver-func.sql
-SQL_DATA   = swh-archiver-data.sql
-SQLS = $(SQL_INIT) $(SQL_SCHEMA) $(SQL_FUNC) $(SQL_DATA)
-
-PSQL_BIN = psql
-PSQL_FLAGS = --single-transaction --echo-all -X
-PSQL = $(PSQL_BIN) $(PSQL_FLAGS)
-
-
-all:
-
-createdb: createdb-stamp
-createdb-stamp: $(SQL_INIT)
-	createdb $(DBNAME)
-	touch $@
-
-filldb: filldb-stamp
-filldb-stamp: createdb-stamp
-	cat $(SQLS) | $(PSQL) $(DBNAME)
-	touch $@
-
-dropdb:
-	-dropdb $(DBNAME)
-
-dumpdb: swh-archiver.dump
-swh.dump: filldb-stamp
-	pg_dump -Fc $(DBNAME) > $@
-
-clean:
-	rm -rf *-stamp $(DOCDIR)/
-
-distclean: clean dropdb
-	rm -f swh.dump
-
-.PHONY: all initdb createdb dropdb doc clean
diff --git a/sql/swh-init.sql b/swh/archiver/sql/10-swh-init.sql
rename from sql/swh-init.sql
rename to swh/archiver/sql/10-swh-init.sql
diff --git a/sql/swh-archiver-schema.sql b/swh/archiver/sql/30-swh-schema.sql
rename from sql/swh-archiver-schema.sql
rename to swh/archiver/sql/30-swh-schema.sql
diff --git a/sql/swh-archiver-func.sql b/swh/archiver/sql/40-swh-func.sql
rename from sql/swh-archiver-func.sql
rename to swh/archiver/sql/40-swh-func.sql
diff --git a/sql/swh-archiver-data.sql b/swh/archiver/sql/50-swh-data.sql
rename from sql/swh-archiver-data.sql
rename to swh/archiver/sql/50-swh-data.sql