diff --git a/oni-core.el b/oni-core.el
index 488d512..be27507 100644
--- a/oni-core.el
+++ b/oni-core.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 20190330120416
-;; Package-Requires: (oni-data-dir expand-region multiple-cursors embrace)
+;; Version: 20190409010902
+;; Package-Requires: (oni-data-dir expand-region multiple-cursors embrace helpful)
 
 ;; 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
@@ -95,6 +95,11 @@
 (global-set-key (kbd "C-x f") 'ffap)
 (global-set-key (kbd "C-x C-b") 'ibuffer)
 
+(global-set-key [remap describe-function] 'helpful-callable)
+(global-set-key [remap describe-key] 'helpful-key)
+(global-set-key [remap describe-variable] 'helpful-variable)
+(global-set-key (kbd "C-c C-d") 'helpful-at-point)
+
 (electric-indent-mode -1)
 
 (when (eql system-type 'windows-nt)
diff --git a/oni-counsel.el b/oni-counsel.el
index fc4252b..2c4349c 100644
--- a/oni-counsel.el
+++ b/oni-counsel.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 20190228214524
-;; Package-Requires: (counsel diminish)
+;; Version: 20190409004833
+;; Package-Requires: (counsel diminish helpful)
 
 ;; 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
@@ -35,6 +35,9 @@
 
 (diminish 'counsel-mode)
 
+(setq counsel-describe-function-function 'helpful-callable)
+(setq counsel-describe-variable-function 'helpful-variable)
+
 ;;;###autoload(with-eval-after-load 'counsel (require 'oni-counsel))
 ;;;###autoload
 (add-hook 'emacs-startup-hook 'counsel-mode)