diff --git a/.emacs.d/mode-org.el b/.emacs.d/mode-org.el
index 94c42292..807c3a2c 100644
--- a/.emacs.d/mode-org.el
+++ b/.emacs.d/mode-org.el
@@ -9,13 +9,14 @@
 ;; Set PDF association in Org-mode (was Evince by default).
 (eval-after-load "org"
   '(progn
+     (require 'tool-pdf)
      ;; Change .pdf association directly within the alist
-     (setcdr (assoc "\\.pdf\\'" org-file-apps) "zathura --fork %s")))
+     (setcdr (assoc "\\.pdf\\'" org-file-apps)
+             (concat pdf-viewer " " (mapconcat 'identity pdf-viewer-args " ")))))
 
 (add-hook
  'org-mode-hook
  (lambda ()
-   (auto-fill-mode -1)
-   ))
+   (auto-fill-mode -1)))
 
 (provide 'mode-org)