diff --git a/lisp/org-docview.el b/lisp/org-docview.el
index 0e05937f0..360c1fe01 100644
--- a/lisp/org-docview.el
+++ b/lisp/org-docview.el
@@ -45,7 +45,10 @@
 
 
 (require 'org)
-(eval-when-compile (require 'doc-view))	; doc-view-current-page macro
+
+(declare-function doc-view-goto-page "ext:doc-view" (page))
+(declare-function image-mode-window-get "ext:image-mode"
+		  (prop &optional winprops))
 
 (autoload 'doc-view-goto-page "doc-view")
 
@@ -66,7 +69,7 @@
   (when (eq major-mode 'doc-view-mode)
     ;; This buffer is in doc-view-mode
     (let* ((path buffer-file-name)
-	   (page (doc-view-current-page))
+	   (page (image-mode-window-get 'page))
 	   (link (concat "docview:" path "::" (number-to-string page)))
 	   (description ""))
       (org-store-link-props