diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 0832eb58..2fa5b745 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -105,7 +105,7 @@
 (add-hook 'change-log-mode-hook 'ambrevar/change-log-set-indent-rules)
 
 ;;; Completion
-(nconc package-selected-packages '(company helm-company))
+(nconc package-selected-packages '(company helm-company slime-company))
 (when (require 'company nil t)
   (setq company-idle-delay nil))
 
diff --git a/.emacs.d/lisp/init-lisp.el b/.emacs.d/lisp/init-lisp.el
index 64d81d0d..ea34e302 100644
--- a/.emacs.d/lisp/init-lisp.el
+++ b/.emacs.d/lisp/init-lisp.el
@@ -101,10 +101,9 @@
 
 ;;; Common LISP.
 (setq inferior-lisp-program "sbcl --noinform")
-;; (add-hook 'slime-mode-hook
-;;           (lambda ()
-;;             (unless (slime-connected-p)
-;;               (save-excursion (slime)))))
+(slime-setup '(slime-fancy slime-asdf slime-indentation))
+(when (require 'slime-company nil t)
+  (add-to-list 'slime-contribs 'slime-company))
 
 ;; Save SLIME history (only for inferior-lisp).
 (defvar ambrevar/slime-comint-input-ring nil)