diff --git a/.gitmodules b/.gitmodules
index 8ca28af..120bb3b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,10 +1,23 @@
 [submodule "borg"]
 	path = lib/borg
 	url = git@gitlab.com:tarsius/borg.git
+[submodule "closql"]
+	path = lib/closql
+	url = git@gitlab.com:tarsius/closql.git
 [submodule "dash"]
 	path = lib/dash
 	url = git@github.com:magnars/dash.el.git
 	no-makeinfo = dash-template.texi
+[submodule "emacsql"]
+	path = lib/emacsql
+	url = git@github.com:skeeto/emacsql.git
+	no-byte-compile = emacsql-pg.el
+[submodule "epkg"]
+	path = lib/epkg
+	url = git@gitlab.com:tarsius/epkg.git
+[submodule "finalize"]
+	path = lib/finalize
+	url = git@github.com:skeeto/elisp-finalize.git
 [submodule "use-package"]
 	path = lib/use-package
 	url = git@github.com:jwiegley/use-package.git
diff --git a/init.el b/init.el
index 3b84d81..bf60c72 100644
--- a/init.el
+++ b/init.el
@@ -26,6 +26,11 @@
   (require  'use-package)
   (setq use-package-verbose t))
 
+(use-package epkg
+  :defer t
+  :init (setq epkg-repository
+              (expand-file-name "var/epkgs/" user-emacs-directory)))
+
 (use-package custom
   :config
   (setq custom-file (expand-file-name "custom.el" user-emacs-directory))
diff --git a/lib/closql b/lib/closql
new file mode 160000
index 0000000..a8b6b2b
--- /dev/null
+++ b/lib/closql
@@ -0,0 +1 @@
+Subproject commit a8b6b2beaa10528b2fd5ed9759136e3959529266
diff --git a/lib/emacsql b/lib/emacsql
new file mode 160000
index 0000000..3042597
--- /dev/null
+++ b/lib/emacsql
@@ -0,0 +1 @@
+Subproject commit 3042597a723157f7a69765d833107b5e9efb3562
diff --git a/lib/epkg b/lib/epkg
new file mode 160000
index 0000000..1755345
--- /dev/null
+++ b/lib/epkg
@@ -0,0 +1 @@
+Subproject commit 17553458c01563170be9c74db37bcc359a4702d4
diff --git a/lib/finalize b/lib/finalize
new file mode 160000
index 0000000..9ac589c
--- /dev/null
+++ b/lib/finalize
@@ -0,0 +1 @@
+Subproject commit 9ac589cf487f5d37163dc9e7ca8c52800710805e