diff --git a/modules/emacs/vc/config.el b/modules/emacs/vc/config.el
index 457ae5090..b9dac3c95 100644
--- a/modules/emacs/vc/config.el
+++ b/modules/emacs/vc/config.el
@@ -1,5 +1,14 @@
 ;;; emacs/vc/config.el -*- lexical-binding: t; -*-
 
+(when (fboundp 'bug-reference-mode)
+  (add-hook! '(text-mode-hook conf-mode-hook) #'bug-reference-mode)
+  (add-hook 'prog-mode-hook #'bug-reference-prog-mode)
+  (map! :map bug-reference-map
+        "RET" (cmds! (and (bound-and-true-p evil-mode)
+                          (evil-normal-state-p))
+                     #'bug-reference-push-button)))
+
+
 (when IS-WINDOWS
   (setenv "GIT_ASKPASS" "git-gui--askpass"))