diff --git a/modules/feature/lookup/autoload/lookup.el b/modules/feature/lookup/autoload/lookup.el
index cd9390121..7e2cb7044 100644
--- a/modules/feature/lookup/autoload/lookup.el
+++ b/modules/feature/lookup/autoload/lookup.el
@@ -153,8 +153,8 @@ Goes down a list of possible backends:
               (helm-dash-installed-docsets))
          (+lookup/in-docsets identifier))
 
-        ((featurep! :feature lookup +devdocs)
-         (+lookup/in-devdocs identifier))
+        ((featurep! +devdocs)
+         (call-interactively #'+lookup/in-devdocs))
 
         ((+lookup/online
           identifier
@@ -166,22 +166,7 @@ Goes down a list of possible backends:
 ;;
 
 ;;;###autoload
-(defun +lookup/in-devdocs (&optional query docs)
-  "TODO"
-  (interactive)
-  (require 'devdocs)
-  (let* ((docs
-          (unless (eq docs 'blank)
-            (or docs (cdr (assq major-mode devdocs-alist)) "")))
-         (query (or query (+lookup--symbol-or-region) ""))
-         (pattern (string-trim-left (format "%s %s" docs query))))
-    (unless (and current-prefix-arg docs)
-      (setq pattern (read-string "Lookup on devdocs.io: " pattern)))
-    (funcall +lookup-open-url-fn
-             (format "%s/#q=%s" devdocs-url
-                     (url-hexify-string pattern)))
-    (unless (string-empty-p pattern)
-      (cl-pushnew pattern devdocs-search-history))))
+(defalias #'+lookup/in-devdocs #'devdocs-lookup)
 
 (defvar counsel-dash-docsets)
 (defvar helm-dash-docsets)
diff --git a/modules/feature/lookup/config.el b/modules/feature/lookup/config.el
index 7e4a8fa46..fff54e5a1 100644
--- a/modules/feature/lookup/config.el
+++ b/modules/feature/lookup/config.el
@@ -201,14 +201,12 @@ See `devdocs-alist' for the defaults. "
     `(dolist (mode ',modes)
        (push (cons mode ,docset) devdocs-alist)))
 
-  (def-package! devdocs
-    :defer t
+  (def-package! devdocs-lookup
+    :commands (devdocs-setup devdocs-lookup)
     :config
-    (setq devdocs-alist
-          (append '((rust-mode . "rust")
-                    (scss-mode . "scss")
-                    (gfm-mode . "markdown")
-                    (nim-mode . "nim")
-                    (typescript-mode . "typescript"))
-                  devdocs-alist))))
+    (setq devdocs-subjects
+          (append '(("SCSS" "scss")
+                    ("GFM" "markdown")
+                    ("Typescript" "typescript"))
+                  devdocs-subjects))))
 
diff --git a/modules/feature/lookup/packages.el b/modules/feature/lookup/packages.el
index 3d54bd1a4..cf09f591b 100644
--- a/modules/feature/lookup/packages.el
+++ b/modules/feature/lookup/packages.el
@@ -14,4 +14,4 @@
     (package! counsel-dash)))
 
 (when (featurep! +devdocs)
-  (package! devdocs))
+  (package! devdocs-lookup :recipe (:fetcher github :repo "skeeto/devdocs-lookup")))