diff --git a/.emacs b/.emacs
index 6766f05..1d2ea8b 100644
--- a/.emacs
+++ b/.emacs
@@ -63,6 +63,15 @@
 (setq-default save-place t)                   ;; activate it for all buffers
 (require 'saveplace)                          ;; get the package
 
+;; Make % work like vi
+(global-set-key "%" 'match-paren)
+(defun match-paren (arg)
+  "Go to the matching paren if on a paren; otherwise insert %."
+  (interactive "p")
+  (cond ((looking-at "\\s\(") (forward-list 1) (backward-char 1))
+        ((looking-at "\\s\)") (forward-char 1) (backward-list 1))
+        (t (self-insert-command (or arg 1)))))
+
 ;; Prevent Emacs from stupidly auto-changing my working directory
 (defun find-file-save-default-directory ()
     (interactive)