diff --git a/oni-eshell.el b/oni-eshell.el
index f3f5b71..1293749 100644
--- a/oni-eshell.el
+++ b/oni-eshell.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 20190226021452
-;; Package-Requires: (eshell-fringe-status)
+;; Version: 20190531074826
+;; Package-Requires: (eshell-fringe-status esh-autosuggest)
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@
 
 (require 'eshell)
 (require 'em-prompt)
+(require 'esh-autosuggest)
 
 (defun oni-eshell--C-d ()
   "Call `delete-char' or close the buffer if it fails."
@@ -47,9 +48,10 @@
   "Set `C-d' to quit eshell if used at end of prompt."
   (define-key eshell-mode-map (kbd "C-d") #'oni-eshell--C-d))
 
-(add-hook 'eshell-load-hook #'oni-eshell--enable-truncating-buffers)
-(add-hook 'eshell-mode-hook 'goto-address-mode)
 (add-hook 'eshell-first-time-mode-hook #'oni-eshell--set-eshell-C-d)
+(add-hook 'eshell-load-hook #'oni-eshell--enable-truncating-buffers)
+(add-hook 'eshell-mode-hook 'esh-autosuggest-mode)
+(add-hook 'eshell-mode-hook 'goto-address-mode)
 
 (if (window-system)
     (add-hook 'eshell-mode-hook 'eshell-fringe-status-mode))