diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 56bf50b73..e83b4dc30 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -782,16 +782,17 @@ compelling reason, so..."
   (add-hook 'kill-emacs-hook #'org-clock-save))
 
 
-(use-package! org-pdfview
+(use-package! org-pdftools
   :when (featurep! :tools pdf)
-  :commands org-pdfview-open
+  :commands org-pdftools-export
   :init
   (after! org
-    (delete '("\\.pdf\\'" . default) org-file-apps)
-    ;; org links to pdf files are opened in pdf-view-mode
-    (add-to-list 'org-file-apps '("\\.pdf\\'" . (lambda (_file link) (org-pdfview-open link))))
-    ;; support for links to specific pages
-    (add-to-list 'org-file-apps '("\\.pdf::\\([[:digit:]]+\\)\\'" . (lambda (_file link) (org-pdfview-open link))))))
+    (org-link-set-parameters "pdftools"
+                             :follow #'org-pdftools-open
+                             :complete #'org-pdftools-complete-link
+                             :store #'org-pdftools-store-link
+                             :export #'org-pdftools-export)
+    (add-hook 'org-store-link-functions #'org-pdftools-store-link)))
 
 
 (use-package! evil-org
diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el
index c8f92cdcf..db8fc38f2 100644
--- a/modules/lang/org/packages.el
+++ b/modules/lang/org/packages.el
@@ -49,7 +49,7 @@
     :recipe (:host github :repo "hlissner/evil-org-mode")
     :pin "4d44e9bbdc"))
 (when (featurep! :tools pdf)
-  (package! org-pdfview :pin "8b71f31363"))
+  (package! org-pdftools :pin "4f22e13e06"))
 (when (featurep! :tools magit)
   (package! orgit :pin "e7cddf39e3"))
 (when (featurep! +brain)