diff --git a/.gitmodules b/.gitmodules
index 120bb3b..fee6232 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,6 +18,13 @@
 [submodule "finalize"]
 	path = lib/finalize
 	url = git@github.com:skeeto/elisp-finalize.git
+[submodule "magit"]
+	path = lib/magit
+	url = git@github.com:magit/magit.git
+	info-path = Documentation
 [submodule "use-package"]
 	path = lib/use-package
 	url = git@github.com:jwiegley/use-package.git
+[submodule "with-editor"]
+	path = lib/with-editor
+	url = git@github.com:magit/with-editor.git
diff --git a/init.el b/init.el
index bf60c72..ce33ea3 100644
--- a/init.el
+++ b/init.el
@@ -47,6 +47,27 @@
 (use-package dash
   :config (dash-enable-font-lock))
 
+(use-package magit
+  :defer t
+  :bind (("C-x g"   . magit-status)
+         ("C-x M-g" . magit-dispatch-popup))
+  :config
+  (magit-add-section-hook 'magit-status-sections-hook
+                          'magit-insert-modules-unpulled-from-upstream
+                          'magit-insert-unpulled-from-upstream)
+  (magit-add-section-hook 'magit-status-sections-hook
+                          'magit-insert-modules-unpulled-from-pushremote
+                          'magit-insert-unpulled-from-upstream)
+  (magit-add-section-hook 'magit-status-sections-hook
+                          'magit-insert-modules-unpushed-to-upstream
+                          'magit-insert-unpulled-from-upstream)
+  (magit-add-section-hook 'magit-status-sections-hook
+                          'magit-insert-modules-unpushed-to-pushremote
+                          'magit-insert-unpulled-from-upstream)
+  (magit-add-section-hook 'magit-status-sections-hook
+                          'magit-insert-submodules
+                          'magit-insert-unpulled-from-upstream))
+
 (progn ;     startup
   (message "Loading %s...done (%.3fs)" user-init-file
            (float-time (time-subtract (current-time)
diff --git a/lib/magit b/lib/magit
new file mode 160000
index 0000000..97972fb
--- /dev/null
+++ b/lib/magit
@@ -0,0 +1 @@
+Subproject commit 97972fb58b0b73696e94454fffeb2058561d7215
diff --git a/lib/with-editor b/lib/with-editor
new file mode 160000
index 0000000..d28d074
--- /dev/null
+++ b/lib/with-editor
@@ -0,0 +1 @@
+Subproject commit d28d07497f67fea4c62fe7a2d3201fd86fb64fe2