diff --git a/packages.el b/packages.el
index 7fb0274..a03219a 100644
--- a/packages.el
+++ b/packages.el
@@ -31,8 +31,7 @@
 
 (defconst gerbil-packages
   '(evil-cleverparens
-    (gerbil-mode :location local)
-    smartparens)
+    (gerbil-mode :location local))
   "The list of Lisp packages required by the gerbil layer.
 
 Each entry is either:
@@ -66,11 +65,14 @@ Each entry is either:
     (add-to-list 'evil-lisp-safe-structural-editing-modes 'gerbil-mode)))
 
 (defun gerbil/init-gerbil-mode ()
-  (use-package gerbil-mode))
-
-(defun gerbil/post-init-smartparens ()
-  (with-eval-after-load 'smartparens
-    (sp-local-pair 'gerbil-mode "`" nil :actions nil)
-    (sp-local-pair 'gerbil-mode "'" nil :actions nil)))
+  (use-package gerbil-mode
+    :defer t
+    :config
+    (progn
+      (with-eval-after-load 'smartparens
+        (add-to-list 'sp--lisp-modes 'gerbil-mode)
+        (when (fboundp 'sp-local-pair)
+          (sp-local-pair 'gerbil-mode "'" nil :actions nil)
+          (sp-local-pair 'gerbil-mode "`" nil :actions nil))))))
 
 ;;; packages.el ends here