diff --git a/modules/feature/version-control/+git.el b/modules/feature/version-control/+git.el
index 90f08cffb..3d33fe6b6 100644
--- a/modules/feature/version-control/+git.el
+++ b/modules/feature/version-control/+git.el
@@ -31,6 +31,18 @@
 (def-package! browse-at-remote
   :commands (browse-at-remote browse-at-remote-get-url))
 
+(def-package! git-timemachine
+  :commands (git-timemachine git-timemachine-toggle)
+  :config
+  (add-hook! 'git-timemachine-mode-hook #'evil-force-normal-state)
+  (map! :map git-timemachine-mode-map
+        :nv "p" 'git-timemachine-show-previous-revision
+        :nv "n" 'git-timemachine-show-next-revision
+        :nv "g" 'git-timemachine-show-nth-revision
+        :nv "q" 'git-timemachine-quit
+        :nv "w" 'git-timemachine-kill-abbreviated-revision
+        :nv "W" 'git-timemachine-kill-revision
+        :nv "b" 'git-timemachine-blame))
 
 (def-package! magit
   :commands magit-status
diff --git a/modules/feature/version-control/packages.el b/modules/feature/version-control/packages.el
index b7d537d54..4e95f4045 100644
--- a/modules/feature/version-control/packages.el
+++ b/modules/feature/version-control/packages.el
@@ -7,6 +7,7 @@
 ;;; +git
 (package! browse-at-remote)
 (package! git-gutter-fringe)
+(package! git-timemachine)
 (package! gitconfig-mode)
 (package! gitignore-mode)
 (package! magit)